diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 13:27:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 13:55:50 +0100 |
| commit | be1e6e7503b2f10b0176201418eb97912cee093f (patch) | |
| tree | 620da8277e8837ccbb93a2a21e14a9b188c95b16 /libavcodec/ffv1dec.c | |
| parent | f4f7888bab7061f08c54356c285adaba24383dc0 (diff) | |
| parent | 1c01b0253ebfe05f907c3a723101fe77f6dd2336 (diff) | |
| download | ffmpeg-be1e6e7503b2f10b0176201418eb97912cee093f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: use the AVFrame API properly.
ffv1: use the AVFrame API properly.
jpegls: use the AVFrame API properly.
huffyuv: use the AVFrame API properly.
Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
| -rw-r--r-- | libavcodec/ffv1dec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 0add4ffa57..166bc259f0 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -938,12 +938,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac uint8_t *dst[4]; ff_thread_await_progress(&f->last_picture, INT_MAX, 0); for (j = 0; j < 4; j++) { - 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); - src[j] = f->last_picture.f->data[j] + f->last_picture.f->linesize[j]* - (fs->slice_y>>sv) + (fs->slice_x>>sh); + 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); + src[j] = f->last_picture.f->data[j] + f->last_picture.f->linesize[j] * + (fs->slice_y >> sv) + (fs->slice_x >> sh); } av_image_copy(dst, p->linesize, (const uint8_t **)src, f->last_picture.f->linesize, |