@@ -578,6 +578,7 @@ static int avi_read_header(AVFormatContext *s)

                 avio_skip(pb, size);

             } else {

                 uint64_t cur_pos = avio_tell(pb);

+                unsigned esize;

                 if (cur_pos < list_end)

                     size = FFMIN(size, list_end - cur_pos);

                 st = s->streams[stream_index];

@@ -591,7 +592,7 @@ static int avi_read_header(AVFormatContext *s)

                         avio_skip(pb, size);

                         break;

                     }

-                    tag1 = ff_get_bmp_header(pb, st);

+                    tag1 = ff_get_bmp_header(pb, st, &esize);

                     if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) {

                         st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;

@@ -653,10 +653,11 @@ enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps)

     return id;

 }

-int ff_get_bmp_header(AVIOContext *pb, AVStream *st)

+int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize)

 {

     int tag1;

-    avio_rl32(pb); /* size */

+    if(esize) *esize = avio_rl32(pb);

+    else               avio_rl32(pb);

     st->codec->width = avio_rl32(pb);

     st->codec->height = (int32_t)avio_rl32(pb);

     avio_rl16(pb); /* planes */

@@ -44,7 +44,7 @@ void ff_end_tag(AVIOContext *pb, int64_t start);

  * bits_per_encoded_sample fields. Does not read extradata.

  * @return codec tag

  */

-int ff_get_bmp_header(AVIOContext *pb, AVStream *st);

+int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize);

 void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);

 int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc);

@@ -522,7 +522,7 @@ static int parse_videoinfoheader2(AVFormatContext *s, AVStream *st)

     AVIOContext *pb = wtv->pb;

     avio_skip(pb, 72);  // picture aspect ratio is unreliable

-    ff_get_bmp_header(pb, st);

+    ff_get_bmp_header(pb, st, NULL);

     return 72 + 40;

 }