summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-03 13:11:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-03 13:11:14 +0000
commitaa6de49e95f4cdc99d7e360cebb9fbf22c184ff5 (patch)
tree70ace050025a82e43e75daa17be9f9b01a953d82 /libavcodec/h264.c
parent44e9dcf13abc4ddcc063f3a1cd4260de820e1127 (diff)
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
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6e8dd617f5..da2e0f19ae 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;