diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:09:12 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:09:12 +0100 |
| commit | 909f5e71001f77a22fb76c440c9f73643b0c943b (patch) | |
| tree | aa1136ea78be3d5940dda6779c99c97cb9c2dd12 /libavcodec/wmv2dec.c | |
| parent | dff9894acdf83121b32aa8233d03c9e5dcd547c0 (diff) | |
| parent | 0c6a70873fc6e43194b471d112c30823b6c8d0b4 (diff) | |
| download | ffmpeg-909f5e71001f77a22fb76c440c9f73643b0c943b.tar.gz | |
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 99c95d397a..0c2f14d55a 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -220,6 +220,10 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) if (w->j_type) { ff_intrax8_decode_picture(&w->x8, 2 * s->qscale, (s->qscale - 1) | 1); + + ff_er_add_slice(&w->s.er, 0, 0, + (w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1, + ER_MB_END); return 1; } |