Remove if() surrounding decode_cabac_mb_type() that can never be true.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2008 15:32:07 +0000 (15:32 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2008 15:32:07 +0000 (15:32 +0000)
Originally committed as revision 16217 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index 3d7f4aa..aa7473a 100644 (file)
@@ -5403,10 +5403,8 @@ static int decode_mb_cabac(H264Context *h) {
     h->prev_mb_skipped = 0;
 
     compute_mb_neighbors(h);
-    if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
-        av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
-        return -1;
-    }
+    mb_type = decode_cabac_mb_type( h );
+    assert(mb_type >= 0);
 
     if( h->slice_type_nos == FF_B_TYPE ) {
         if( mb_type < 23 ){