[FFmpeg-cvslog] avformat/mov: Do not read ACLR into extradata for H.264

[Michael Niedermayer]

ffmpeg | branch: release/2.6 | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 30 00:02:47 2015 +0200| [48e53620e01b7ee26c182dda5d8ddcf70c04b852] | committer: Michael Niedermayer

avformat/mov: Do not read ACLR into extradata for H.264

Fixes regression decoding AVCI
Fixes Ticket4493

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2025e803cd0c865b6ca2f80160293de28eb5efed)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48e53620e01b7ee26c182dda5d8ddcf70c04b852
---

 libavformat/mov.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index de4004f..2658a11 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1209,6 +1209,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);