diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 00:02:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 00:02:47 +0200 |
| commit | 2025e803cd0c865b6ca2f80160293de28eb5efed (patch) | |
| tree | bed2d2cc6b39ebaca0e37348d2c5c2e0d34ad4a9 | |
| parent | f8fa392a2edb517c4b17ae0ea1dab806d38533dc (diff) | |
| download | ffmpeg-2025e803cd0c865b6ca2f80160293de28eb5efed.tar.gz | |
avformat/mov: Do not read ACLR into extradata for H.264
Fixes regression decoding AVCI
Fixes Ticket4493
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 0601830a14..54930a4052 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1212,6 +1212,8 @@ static int mov_read_aclr(MOVContext *c, AVIOContext *pb, MOVAtom atom) uint64_t original_size; if (c->fc->nb_streams >= 1) { AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec; + if (codec->codec_id == AV_CODEC_ID_H264) + return 0; if (atom.size == 16) { original_size = codec->extradata_size; ret = mov_realloc_extradata(codec, atom); |