From d464bceff2c9a9106f81c5c060596a92dfbb7fad Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 18 Sep 2008 15:13:15 +0000 Subject: [PATCH] Ensure that extradata is not parsed twice. Fixes FRExt1_Panasonic. Originally committed as revision 15361 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 758d8f5..30cf965 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); -- 2.7.4