diff options
| author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2017-02-08 12:51:37 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-02-15 11:21:11 +0100 |
| commit | 0539d84d985e811e5989ef27c13f7e2dda0f9b89 (patch) | |
| tree | 5a2dc172240dcf0dbae104e16b23352868928144 /libavformat/asfdec.c | |
| parent | 871b4f3654636ed64560e86b9faa33828d195ceb (diff) | |
| download | ffmpeg-0539d84d985e811e5989ef27c13f7e2dda0f9b89.tar.gz | |
asfdec: Account for different Format Data sizes
Some muxers may use the BMP_HEADER Format Data size instead
of the ASF-specific one.
Bug-Id: 1020
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index d602af8793..34730b20aa 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -691,20 +691,22 @@ static int asf_read_properties(AVFormatContext *s, const GUIDParseTable *g) static int parse_video_info(AVIOContext *pb, AVStream *st) { - uint16_t size; + uint16_t size_asf; // ASF-specific Format Data size + uint32_t size_bmp; // BMP_HEADER-specific Format Data size unsigned int tag; st->codecpar->width = avio_rl32(pb); st->codecpar->height = avio_rl32(pb); avio_skip(pb, 1); // skip reserved flags - size = avio_rl16(pb); // size of the Format Data - tag = ff_get_bmp_header(pb, st); + size_asf = avio_rl16(pb); + tag = ff_get_bmp_header(pb, st, &size_bmp); st->codecpar->codec_tag = tag; st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag); + size_bmp = FFMAX(size_asf, size_bmp); - if (size > BMP_HEADER_SIZE) { + if (size_bmp > BMP_HEADER_SIZE) { int ret; - st->codecpar->extradata_size = size - BMP_HEADER_SIZE; + st->codecpar->extradata_size = size_bmp - BMP_HEADER_SIZE; if (!(st->codecpar->extradata = av_malloc(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE))) { st->codecpar->extradata_size = 0; |