diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:11:21 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:11:21 +0200 |
| commit | 42b87ed01eb32b3b449e35b2926492c48220e321 (patch) | |
| tree | 5f7e93439793e324e113444c6fe06d0a5fcfaaf2 /libavcodec/roqvideodec.c | |
| parent | 9a6f1eea3e1d6412d2bf1d4bca7dc01122208f42 (diff) | |
| parent | f0a106578d759de6183eea3c75f8373b6d3153c1 (diff) | |
| download | ffmpeg-42b87ed01eb32b3b449e35b2926492c48220e321.tar.gz | |
Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'
* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1':
roqvideodec: Replace avpicture functions with imgutils
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/roqvideodec.c')
| -rw-r--r-- | libavcodec/roqvideodec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 68ef160ecf..362e88292c 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -26,6 +26,8 @@ */ #include "libavutil/avassert.h" +#include "libavutil/imgutils.h" + #include "avcodec.h" #include "bytestream.h" #include "internal.h" @@ -209,8 +211,9 @@ static int roq_decode_frame(AVCodecContext *avctx, return ret; if(copy) - av_picture_copy((AVPicture*)s->current_frame, (AVPicture*)s->last_frame, - avctx->pix_fmt, avctx->width, avctx->height); + av_image_copy(s->current_frame->data, s->current_frame->linesize, + s->last_frame->data, s->last_frame->linesize, + avctx->pix_fmt, avctx->width, avctx->height); bytestream2_init(&s->gb, buf, buf_size); roqvideo_decode_frame(s); |