diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-13 14:39:44 +0400 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-13 16:25:11 +0400 |
| commit | 79a3f364dd35dfe07f03f2b2b1a737d07046e864 (patch) | |
| tree | 7c770578452f9a87120eb1cb2672d58165f5eb71 /libavformat | |
| parent | 33d699a4e73d5281b2cfcd0fa355c0d80241dd23 (diff) | |
Do not read strd chunk in avi files as H264 extradata.
Fixes ticket #2561.
(cherry picked from commit 231b3317184790b6be4b4619d96fd328f13aeabb)
Diffstat (limited to 'libavformat')
| -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 00ac3de2af..18e2d96868 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -706,7 +706,9 @@ static int avi_read_header(AVFormatContext *s) } 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); |