Mercurial > libavcodec.hg
comparison msmpeg4.c @ 2632:67171616ead6 libavcodec
avoid unneeded clear_blocks()
| author | michael |
|---|---|
| date | Mon, 25 Apr 2005 00:57:48 +0000 |
| parents | 511e3afc43e1 |
| children | ef44d24680d1 |
comparison
equal
deleted
inserted
replaced
| 2631:c49619ee4c35 | 2632:67171616ead6 |
|---|---|
| 1550 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors | 1550 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors |
| 1551 if(s->pict_type==P_TYPE) cbp^=0x3C; | 1551 if(s->pict_type==P_TYPE) cbp^=0x3C; |
| 1552 } | 1552 } |
| 1553 } | 1553 } |
| 1554 | 1554 |
| 1555 s->dsp.clear_blocks(s->block[0]); | |
| 1555 for (i = 0; i < 6; i++) { | 1556 for (i = 0; i < 6; i++) { |
| 1556 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) | 1557 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) |
| 1557 { | 1558 { |
| 1558 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); | 1559 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); |
| 1559 return -1; | 1560 return -1; |
| 1642 s->rl_table_index = decode012(&s->gb); | 1643 s->rl_table_index = decode012(&s->gb); |
| 1643 s->rl_chroma_table_index = s->rl_table_index; | 1644 s->rl_chroma_table_index = s->rl_table_index; |
| 1644 } | 1645 } |
| 1645 } | 1646 } |
| 1646 | 1647 |
| 1648 s->dsp.clear_blocks(s->block[0]); | |
| 1647 for (i = 0; i < 6; i++) { | 1649 for (i = 0; i < 6; i++) { |
| 1648 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) | 1650 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) |
| 1649 { | 1651 { |
| 1650 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); | 1652 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); |
| 1651 return -1; | 1653 return -1; |