[FFmpeg-cvslog] r15361 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Thu Sep 18 17:13:15 2008
New Revision: 15361

Log:
Ensure that extradata is not parsed twice.
Fixes FRExt1_Panasonic.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Thu Sep 18 17:13:15 2008
@@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *
         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);