Commit d464bcef authored by Michael Niedermayer's avatar Michael Niedermayer

Ensure that extradata is not parsed twice.

Fixes FRExt1_Panasonic.

Originally committed as revision 15361 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3a9a15c4
......@@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *avctx,
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)
return -1;
h->got_avcC = 1;
}
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