[FFmpeg-cvslog] r21668 - trunk/libavcodec/h264_ps.c

[michael]

Author: michael
Date: Sun Feb  7 16:12:37 2010
New Revision: 21668

Log:
Check direct_8x8_inference_flag.

Modified:
   trunk/libavcodec/h264_ps.c

Modified: trunk/libavcodec/h264_ps.c
==============================================================================
--- trunk/libavcodec/h264_ps.c	Sun Feb  7 15:55:59 2010	(r21667)
+++ trunk/libavcodec/h264_ps.c	Sun Feb  7 16:12:37 2010	(r21668)
@@ -347,6 +347,10 @@ int ff_h264_decode_seq_parameter_set(H26
         sps->mb_aff= 0;
 
     sps->direct_8x8_inference_flag= get_bits1(&s->gb);
+    if(!sps->frame_mbs_only_flag && !sps->direct_8x8_inference_flag){
+        av_log(h->s.avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
+        goto fail;
+    }
 
 #ifndef ALLOW_INTERLACE
     if(sps->mb_aff)