Commit 0b2b584f authored by michael's avatar michael

Remove if() surrounding decode_cabac_mb_type() that can never be true.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16217 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 77e860b8
...@@ -5403,10 +5403,8 @@ static int decode_mb_cabac(H264Context *h) { ...@@ -5403,10 +5403,8 @@ static int decode_mb_cabac(H264Context *h) {
h->prev_mb_skipped = 0; h->prev_mb_skipped = 0;
compute_mb_neighbors(h); compute_mb_neighbors(h);
if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { mb_type = decode_cabac_mb_type( h );
av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" ); assert(mb_type >= 0);
return -1;
}
if( h->slice_type_nos == FF_B_TYPE ) { if( h->slice_type_nos == FF_B_TYPE ) {
if( mb_type < 23 ){ if( mb_type < 23 ){
......
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