always decode extradata when of non-avc stream (like RTSP)

Patch by Francois Oligny-Lemieux % eucloid A gmail P com %
Original thread:
Date: Feb 9, 2007 12:00 AM
Subject: [Ffmpeg-devel] h264.c patch, always decoding extradata when on non avc stream

Originally committed as revision 7904 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d696676..5815720 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -8314,7 +8314,7 @@ static int decode_frame(AVCodecContext *avctx,
         h->got_avcC = 1;
     }
 
-    if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
+    if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
         if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
             return -1;
     }