From aa6de49e95f4cdc99d7e360cebb9fbf22c184ff5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 3 Aug 2008 13:11:14 +0000 Subject: [PATCH] Remove useless mb_field_decoding_flag setting code that was at the wrong spot. Originally committed as revision 14519 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6e8dd61..da2e0f1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4348,8 +4348,7 @@ static int decode_mb_cavlc(H264Context *h){ if(FRAME_MBAFF){ if( (s->mb_y&1) == 0 ) h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); - }else - h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); + } h->prev_mb_skipped= 0; @@ -5467,8 +5466,7 @@ static int decode_mb_cabac(H264Context *h) { if( (s->mb_y&1) == 0 ) h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); - }else - h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); + } h->prev_mb_skipped = 0; -- 2.7.4