Mercurial > libavcodec.hg
comparison h264.c @ 8416:7f93fb360055 libavcodec
Remove useless code.
| author | michael |
|---|---|
| date | Sun, 21 Dec 2008 17:49:40 +0000 |
| parents | 938824a1f42f |
| children | 3597fc56c227 |
comparison
equal
deleted
inserted
replaced
| 8415:938824a1f42f | 8416:7f93fb360055 |
|---|---|
| 5354 /* read skip flags */ | 5354 /* read skip flags */ |
| 5355 if( skip ) { | 5355 if( skip ) { |
| 5356 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ | 5356 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ |
| 5357 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; | 5357 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; |
| 5358 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); | 5358 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); |
| 5359 if(h->next_mb_skipped) | 5359 if(!h->next_mb_skipped) |
| 5360 predict_field_decoding_flag(h); | |
| 5361 else | |
| 5362 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | 5360 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
| 5363 } | 5361 } |
| 5364 | 5362 |
| 5365 decode_mb_skip(h); | 5363 decode_mb_skip(h); |
| 5366 | 5364 |
| 6548 if(ret>=0) hl_decode_mb(h); | 6546 if(ret>=0) hl_decode_mb(h); |
| 6549 | 6547 |
| 6550 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ? | 6548 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
| 6551 s->mb_y++; | 6549 s->mb_y++; |
| 6552 | 6550 |
| 6553 if(ret>=0) ret = decode_mb_cabac(h); | 6551 ret = decode_mb_cabac(h); |
| 6554 | 6552 |
| 6555 if(ret>=0) hl_decode_mb(h); | 6553 if(ret>=0) hl_decode_mb(h); |
| 6556 s->mb_y--; | 6554 s->mb_y--; |
| 6557 } | 6555 } |
| 6558 eos = get_cabac_terminate( &h->cabac ); | 6556 eos = get_cabac_terminate( &h->cabac ); |