diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 13:25:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 13:25:12 +0200 |
| commit | e70e2583d07188b6508cfb097ab222afd6b08d11 (patch) | |
| tree | ac08f76114459ede36e338957be0509b2c560388 | |
| parent | 2dedd8988a12eb088dad418bea9f71e791a27336 (diff) | |
| parent | 231b3317184790b6be4b4619d96fd328f13aeabb (diff) | |
| download | ffmpeg-e70e2583d07188b6508cfb097ab222afd6b08d11.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not read strd chunk in avi files as H264 extradata.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 2066c18f65..b80effc33c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -713,7 +713,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); |