[FFmpeg-cvslog] r16216 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Thu Dec 18 16:21:15 2008
New Revision: 16216

Log:
Remove unreachable else clause, found by dark shikari.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Thu Dec 18 16:21:15 2008
@@ -4803,11 +4803,12 @@ static int decode_cabac_mb_type( H264Con
         } else {
             return decode_cabac_intra_mb_type(h, 17, 0) + 5;
         }
-    } else if( h->slice_type_nos == FF_B_TYPE ) {
+    } else {
         const int mba_xy = h->left_mb_xy[0];
         const int mbb_xy = h->top_mb_xy;
         int ctx = 0;
         int bits;
+        assert(h->slice_type_nos == FF_B_TYPE);
 
         if( h->slice_table[mba_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
             ctx++;
@@ -4836,9 +4837,6 @@ static int decode_cabac_mb_type( H264Con
 
         bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
         return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
-    } else {
-        /* TODO SI/SP frames? */
-        return -1;
     }
 }