Commit c325b505 authored by Michael Niedermayer's avatar Michael Niedermayer

Remove unreachable else clause, found by dark shikari.

Originally committed as revision 16216 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent dae006d7
...@@ -4803,11 +4803,12 @@ static int decode_cabac_mb_type( H264Context *h ) { ...@@ -4803,11 +4803,12 @@ static int decode_cabac_mb_type( H264Context *h ) {
} else { } else {
return decode_cabac_intra_mb_type(h, 17, 0) + 5; 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 mba_xy = h->left_mb_xy[0];
const int mbb_xy = h->top_mb_xy; const int mbb_xy = h->top_mb_xy;
int ctx = 0; int ctx = 0;
int bits; 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] ) ) if( h->slice_table[mba_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
ctx++; ctx++;
...@@ -4836,9 +4837,6 @@ static int decode_cabac_mb_type( H264Context *h ) { ...@@ -4836,9 +4837,6 @@ static int decode_cabac_mb_type( H264Context *h ) {
bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */ return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
} else {
/* TODO SI/SP frames? */
return -1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment