diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 00:02:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 10:04:50 +0200 |
| commit | 48e53620e01b7ee26c182dda5d8ddcf70c04b852 (patch) | |
| tree | f89d67baacc481825a7c55ce30cd3710062221df | |
| parent | 8a7748e1de22055889e2ae5de8b404155d845b3f (diff) | |
| download | ffmpeg-48e53620e01b7ee26c182dda5d8ddcf70c04b852.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>
(cherry picked from commit 2025e803cd0c865b6ca2f80160293de28eb5efed)
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 de4004f3cc..2658a1130a 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); |