har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes regression decoding AVCI
Fixes Ticket4493

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-30 00:02:47 +02:00
parent f8fa392a2e
commit 2025e803cd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mov.c
View File

@ -1212,6 +1212,8 @@ static int mov_read_aclr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
uint64_t original_size; uint64_t original_size;
if (c->fc->nb_streams >= 1) { if (c->fc->nb_streams >= 1) {
AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec; 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) { if (atom.size == 16) {
original_size = codec->extradata_size; original_size = codec->extradata_size;
ret = mov_realloc_extradata(codec, atom); ret = mov_realloc_extradata(codec, atom);