# HG changeset patch # User michael # Date 1229881780 0 # Node ID 7f93fb3600551573c6b8f266917be29198c756b8 # Parent 938824a1f42f3363335153a160f82a2c2701c749 Remove useless code. diff -r 938824a1f42f -r 7f93fb360055 h264.c --- a/h264.c Sun Dec 21 15:58:42 2008 +0000 +++ b/h264.c Sun Dec 21 17:49:40 2008 +0000 @@ -5356,9 +5356,7 @@ if( FRAME_MBAFF && (s->mb_y&1)==0 ){ s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); - if(h->next_mb_skipped) - predict_field_decoding_flag(h); - else + if(!h->next_mb_skipped) h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); } @@ -6550,7 +6548,7 @@ if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ? s->mb_y++; - if(ret>=0) ret = decode_mb_cabac(h); + ret = decode_mb_cabac(h); if(ret>=0) hl_decode_mb(h); s->mb_y--;