Mercurial > libavcodec.hg

diff h264.c @ 7888:d0489fa75c41 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure that extradata is not parsed twice. Fixes FRExt1_Panasonic.
author michael
date Thu, 18 Sep 2008 15:13:15 +0000
parents d35a71a3db5f
children 59e42f624d4d
line wrap: on
line diff
--- a/h264.c	Thu Sep 18 14:08:44 2008 +0000
+++ b/h264.c	Thu Sep 18 15:13:15 2008 +0000
@@ -7547,9 +7547,10 @@
         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);