diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:36:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:38:41 +0100 |
| commit | 9f890a165666a73376c73b3c2bd920345b5c3b79 (patch) | |
| tree | c458e2bc9350fd0be13b249b63bd319330870e0f /libavcodec/indeo2.c | |
| parent | 10ac6f3ce9ae4065a5b72ddfaded45f75b357518 (diff) | |
| parent | 2e09096da912f563c4dd889a8f25c314529bbaa6 (diff) | |
| download | ffmpeg-9f890a165666a73376c73b3c2bd920345b5c3b79.tar.gz | |
Merge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'
* commit '2e09096da912f563c4dd889a8f25c314529bbaa6':
kgv1: use the AVFrame API properly.
indeo2: use the AVFrame API properly.
iff: use the AVFrame API properly.
msrle: use the AVFrame API properly.
Conflicts:
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/kgv1dec.c
libavcodec/msrle.c
See: 451b2ca1b4349f9b60416cc057eaf5518d81025c
See: 80e9e63c946660304fc65fa8141ccfdbe4d196d1
See: 057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo2.c')
| -rw-r--r-- | libavcodec/indeo2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index d3bbc6d20f..aabe348b4f 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -171,36 +171,36 @@ static int ir2_decode_frame(AVCodecContext *avctx, if (s->decode_delta) { /* intraframe */ if ((ret = ir2_decode_plane(s, avctx->width, avctx->height, - s->picture->data[0], s->picture->linesize[0], + p->data[0], p->linesize[0], ir2_luma_table)) < 0) return ret; /* swapped U and V */ if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2, - s->picture->data[2], s->picture->linesize[2], + p->data[2], p->linesize[2], ir2_luma_table)) < 0) return ret; if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2, - s->picture->data[1], s->picture->linesize[1], + p->data[1], p->linesize[1], ir2_luma_table)) < 0) return ret; } else { /* interframe */ if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height, - s->picture->data[0], s->picture->linesize[0], + p->data[0], p->linesize[0], ir2_luma_table)) < 0) return ret; /* swapped U and V */ if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2, - s->picture->data[2], s->picture->linesize[2], + p->data[2], p->linesize[2], ir2_luma_table)) < 0) return ret; if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2, - s->picture->data[1], s->picture->linesize[1], + p->data[1], p->linesize[1], ir2_luma_table)) < 0) return ret; } - if ((ret = av_frame_ref(picture, s->picture)) < 0) + if ((ret = av_frame_ref(picture, p)) < 0) return ret; *got_frame = 1; |