diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-13 12:39:44 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-13 16:03:16 +0200 |
| commit | d95bb2ac2d54ce3e0cd8fe86708b0059ec948c5a (patch) | |
| tree | d12c50d9e709d72df19e42d20f89ae368d3ee03c | |
| parent | 48f0a2c2394c73b85c4944cd7c8451f6f5c7c5bb (diff) | |
| download | ffmpeg-d95bb2ac2d54ce3e0cd8fe86708b0059ec948c5a.tar.gz | |
Do not read strd chunk in avi files as H264 extradata.
Fixes ticket #2561.
(cherry picked from commit 231b3317184790b6be4b4619d96fd328f13aeabb)
| -rw-r--r-- | libavformat/avidec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 41e2e3c027..c0b6308b6f 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -694,7 +694,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) } break; case MKTAG('s', 't', 'r', 'd'): - if (stream_index >= (unsigned)s->nb_streams || s->streams[stream_index]->codec->extradata_size) { + if (stream_index >= (unsigned)s->nb_streams + || s->streams[stream_index]->codec->extradata_size + || s->streams[stream_index]->codec->codec_tag == MKTAG('H','2','6','4')) { avio_skip(pb, size); } else { uint64_t cur_pos = avio_tell(pb); |