Mercurial > libavcodec.hg
comparison h264.c @ 7469:856df346b536 libavcodec
Remove useless mb_field_decoding_flag setting code that was at the wrong spot.
| author | michael |
|---|---|
| date | Sun, 03 Aug 2008 13:11:14 +0000 |
| parents | 38e9f32f8d43 |
| children | 9ed1ef44127b |
comparison
equal
deleted
inserted
replaced
| 7468:38e9f32f8d43 | 7469:856df346b536 |
|---|---|
| 4346 } | 4346 } |
| 4347 } | 4347 } |
| 4348 if(FRAME_MBAFF){ | 4348 if(FRAME_MBAFF){ |
| 4349 if( (s->mb_y&1) == 0 ) | 4349 if( (s->mb_y&1) == 0 ) |
| 4350 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | 4350 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); |
| 4351 }else | 4351 } |
| 4352 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); | |
| 4353 | 4352 |
| 4354 h->prev_mb_skipped= 0; | 4353 h->prev_mb_skipped= 0; |
| 4355 | 4354 |
| 4356 mb_type= get_ue_golomb(&s->gb); | 4355 mb_type= get_ue_golomb(&s->gb); |
| 4357 if(h->slice_type_nos == FF_B_TYPE){ | 4356 if(h->slice_type_nos == FF_B_TYPE){ |
| 5465 } | 5464 } |
| 5466 if(FRAME_MBAFF){ | 5465 if(FRAME_MBAFF){ |
| 5467 if( (s->mb_y&1) == 0 ) | 5466 if( (s->mb_y&1) == 0 ) |
| 5468 h->mb_mbaff = | 5467 h->mb_mbaff = |
| 5469 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | 5468 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
| 5470 }else | 5469 } |
| 5471 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); | |
| 5472 | 5470 |
| 5473 h->prev_mb_skipped = 0; | 5471 h->prev_mb_skipped = 0; |
| 5474 | 5472 |
| 5475 compute_mb_neighbors(h); | 5473 compute_mb_neighbors(h); |
| 5476 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { | 5474 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { |