diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-19 20:51:44 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-22 16:51:09 -0400 |
| commit | 0c6a70873fc6e43194b471d112c30823b6c8d0b4 (patch) | |
| tree | 1279e3dc70f0c45f1afe87d3a984d1838b1ed8f4 /libavcodec/vc1_block.c | |
| parent | 709c0f79d8032fcf733bfe58e79ca7ff0858c8bc (diff) | |
| download | ffmpeg-0c6a70873fc6e43194b471d112c30823b6c8d0b4.tar.gz | |
intrax8: Move error resilience out of intrax8
The intrax8 decoding process does not imply any kind of error
resilience, and the only call present is more related to how mpegvideo
works rather than anything else.
Therefore have the parent decoders carry out er when actually needed.
Diffstat (limited to 'libavcodec/vc1_block.c')
| -rw-r--r-- | libavcodec/vc1_block.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 4588af4100..8b46260ef2 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -3023,6 +3023,10 @@ void ff_vc1_decode_blocks(VC1Context *v) v->s.esc3_level_length = 0; if (v->x8_type) { ff_intrax8_decode_picture(&v->x8, 2*v->pq + v->halfpq, v->pq * !v->pquantizer); + + ff_er_add_slice(&v->s.er, 0, 0, + (v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1, + ER_MB_END); } else { v->cur_blk_idx = 0; v->left_blk_idx = -1; |