Commit cc970d4c authored by michael's avatar michael

Ensure that extradata is not parsed twice.

Fixes FRExt1_Panasonic.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15361 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7b02154c
...@@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *avctx,
h->got_avcC = 1; h->got_avcC = 1;
} }
if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){ if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
return -1; return -1;
h->got_avcC = 1;
} }
buf_index=decode_nal_units(h, buf, buf_size); buf_index=decode_nal_units(h, buf, buf_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment