Mercurial > libavcodec.hg

changeset 8416:7f93fb360055 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless code.
author michael
date Sun, 21 Dec 2008 17:49:40 +0000
parents 938824a1f42f
children ad4f10287633
files h264.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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--;