diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 15:21:15 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 15:21:15 +0000 |
| commit | c325b5054f7cedb541ebd2f36059d7315a965d5f (patch) | |
| tree | ca7efa27ab8a2ecbcb15bc6fd930b1322df0de55 /libavcodec/h264.c | |
| parent | dae006d7d7e29b361e28a32b2de2699f9bf4d709 (diff) | |
| download | ffmpeg-c325b5054f7cedb541ebd2f36059d7315a965d5f.tar.gz | |
Remove unreachable else clause, found by dark shikari.
Originally committed as revision 16216 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 40351b6b24..3d7f4aad93 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4803,11 +4803,12 @@ static int decode_cabac_mb_type( H264Context *h ) { } 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( H264Context *h ) { 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; } } |