Mercurial > libavcodec.hg
comparison h264.c @ 8384:9754fef77769 libavcodec
Remove if() surrounding decode_cabac_mb_type() that can never be true.
author | michael |
---|---|
date | Thu, 18 Dec 2008 15:32:07 +0000 |
parents | 4be7fab48777 |
children | af35581ac2ca |
comparison
equal
deleted
inserted
replaced
8383:4be7fab48777 | 8384:9754fef77769 |
---|---|
5401 } | 5401 } |
5402 | 5402 |
5403 h->prev_mb_skipped = 0; | 5403 h->prev_mb_skipped = 0; |
5404 | 5404 |
5405 compute_mb_neighbors(h); | 5405 compute_mb_neighbors(h); |
5406 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { | 5406 mb_type = decode_cabac_mb_type( h ); |
5407 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" ); | 5407 assert(mb_type >= 0); |
5408 return -1; | |
5409 } | |
5410 | 5408 |
5411 if( h->slice_type_nos == FF_B_TYPE ) { | 5409 if( h->slice_type_nos == FF_B_TYPE ) { |
5412 if( mb_type < 23 ){ | 5410 if( mb_type < 23 ){ |
5413 partition_count= b_mb_type_info[mb_type].partition_count; | 5411 partition_count= b_mb_type_info[mb_type].partition_count; |
5414 mb_type= b_mb_type_info[mb_type].type; | 5412 mb_type= b_mb_type_info[mb_type].type; |