Commit aa6de49e authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 44e9dcf1
...@@ -4348,8 +4348,7 @@ static int decode_mb_cavlc(H264Context *h){ ...@@ -4348,8 +4348,7 @@ static int decode_mb_cavlc(H264Context *h){
if(FRAME_MBAFF){ if(FRAME_MBAFF){
if( (s->mb_y&1) == 0 ) if( (s->mb_y&1) == 0 )
h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); 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; h->prev_mb_skipped= 0;
...@@ -5467,8 +5466,7 @@ static int decode_mb_cabac(H264Context *h) { ...@@ -5467,8 +5466,7 @@ static int decode_mb_cabac(H264Context *h) {
if( (s->mb_y&1) == 0 ) if( (s->mb_y&1) == 0 )
h->mb_mbaff = h->mb_mbaff =
h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); 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; h->prev_mb_skipped = 0;
......
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