[Ffmpeg-cvslog] r7547 - trunk/libavcodec/h264.c

reimar subversion
Tue Jan 16 18:46:26 CET 2007


Author: reimar
Date: Tue Jan 16 18:46:26 2007
New Revision: 7547

Modified:
   trunk/libavcodec/h264.c

Log:
Avoid calling decode_slice when context_initialized is not set.
Avoids a crash due to dsp.clear_blocks being NULL when called.


Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Tue Jan 16 18:46:26 2007
@@ -8067,6 +8067,7 @@
             h->inter_gb_ptr= &h->inter_gb;
 
             if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning
+               && s->context_initialized
                && s->hurry_up < 5
                && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
                && (avctx->skip_frame < AVDISCARD_BIDIR  || h->slice_type!=B_TYPE)




More information about the ffmpeg-cvslog mailing list