diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index b24a1faf00..fb21090678 100644
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@@ -24,10 +24,6 @@
 
 #include "avcodec.h"
 
-typedef struct BMPContext {
-    AVFrame picture;
-} BMPContext;
-
 typedef enum {
     BMP_RGB         =0,
     BMP_RLE8        =1,
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index bda679903c..ee23a0c7cd 100644
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -32,11 +32,6 @@ static const uint32_t rgb565_masks[]  = { 0xF800, 0x07E0, 0x001F };
 static const uint32_t rgb444_masks[]  = { 0x0F00, 0x00F0, 0x000F };
 
 static av_cold int bmp_encode_init(AVCodecContext *avctx){
-    BMPContext *s = avctx->priv_data;
-
-    avcodec_get_frame_defaults(&s->picture);
-    avctx->coded_frame = &s->picture;
-
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_BGRA:
         avctx->bits_per_coded_sample = 32;
@@ -71,15 +66,14 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){
 static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *pict, int *got_packet)
 {
-    BMPContext *s = avctx->priv_data;
-    AVFrame * const p = &s->picture;
     int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret;
     const uint32_t *pal = NULL;
     uint32_t palette256[256];
     int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
     int bit_count = avctx->bits_per_coded_sample;
     uint8_t *ptr, *buf;
-    *p = *pict;
+    AVFrame * const p = (AVFrame *)pict;
+
     p->pict_type= AV_PICTURE_TYPE_I;
     p->key_frame= 1;
     switch (avctx->pix_fmt) {
@@ -169,7 +163,6 @@ AVCodec ff_bmp_encoder = {
     .name           = "bmp",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_BMP,
-    .priv_data_size = sizeof(BMPContext),
     .init           = bmp_encode_init,
     .encode2        = bmp_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){