From 2025e803cd0c865b6ca2f80160293de28eb5efed Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 30 Apr 2015 00:02:47 +0200 Subject: [PATCH] avformat/mov: Do not read ACLR into extradata for H.264 Fixes regression decoding AVCI Fixes Ticket4493 Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) 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);