diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 15:32:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 15:32:07 +0000 |
| commit | c375d87f6f22e3b5300c4c0798cc918ebda11356 (patch) | |
| tree | a71803fe597be549e02249a9e6f0f25d9209c332 /libavcodec | |
| parent | c325b5054f7cedb541ebd2f36059d7315a965d5f (diff) | |
| download | ffmpeg-c375d87f6f22e3b5300c4c0798cc918ebda11356.tar.gz | |
Remove if() surrounding decode_cabac_mb_type() that can never be true.
Originally committed as revision 16217 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -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 3d7f4aad93..aa7473aeac 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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 ){ |