diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-25 16:44:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-25 16:45:43 +0200 |
| commit | 25df7b1c35bf488b5dcc60f539fa74870182c647 (patch) | |
| tree | b90ee95d038f5bea91a497fe9d0ef6990dfb7378 /libavcodec/ffv1dec.c | |
| parent | b2955b6c5aed11026ec5c7164462899a10cdb937 (diff) | |
| download | ffmpeg-25df7b1c35bf488b5dcc60f539fa74870182c647.tar.gz | |
avcodec/ffv1dec: Fix >8bps error concealment
Fixes: 03_cave_girls_h264_slc24_slicecrc1_fuzzed.avi
Found-by: Dinah Handel <dinahrhandel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ffv1dec.c')
| -rw-r--r-- | libavcodec/ffv1dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index fd9dc6098c..6ab6a96c3f 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -979,16 +979,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac FFV1Context *fs = f->slice_context[i]; int j; if (fs->slice_damaged && f->last_picture.f->data[0]) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const uint8_t *src[4]; uint8_t *dst[4]; ff_thread_await_progress(&f->last_picture, INT_MAX, 0); for (j = 0; j < 4; j++) { + int pixshift = desc->comp[j].depth > 8; int sh = (j == 1 || j == 2) ? f->chroma_h_shift : 0; int sv = (j == 1 || j == 2) ? f->chroma_v_shift : 0; dst[j] = p->data[j] + p->linesize[j] * - (fs->slice_y >> sv) + (fs->slice_x >> sh); + (fs->slice_y >> sv) + ((fs->slice_x >> sh) << pixshift); src[j] = f->last_picture.f->data[j] + f->last_picture.f->linesize[j] * - (fs->slice_y >> sv) + (fs->slice_x >> sh); + (fs->slice_y >> sv) + ((fs->slice_x >> sh) << pixshift); } av_image_copy(dst, p->linesize, src, f->last_picture.f->linesize, |