diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-31 00:46:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-31 00:46:02 +0200 |
| commit | 76853a3e0ce4d4ef09ffcca7307991b8db832cd4 (patch) | |
| tree | a2a73b931a7391246ba02de38546e9b3fc83b840 /libavformat/avidec.c | |
| parent | a1fc1d2e1b4a5bcfd07549dce9735f24237aa32e (diff) | |
| download | ffmpeg-76853a3e0ce4d4ef09ffcca7307991b8db832cd4.tar.gz | |
libavformat: ff_get_bmp_header: return esize too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7057a91111..1638e28674 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -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; |