[FFmpeg-cvslog] roqvideodec: Replace avpicture functions with imgutils

Vittorio Giovara git at videolan.org
Thu Oct 22 20:24:12 CEST 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Oct 14 11:33:21 2015 +0200| [f0a106578d759de6183eea3c75f8373b6d3153c1] | committer: Vittorio Giovara

roqvideodec: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0a106578d759de6183eea3c75f8373b6d3153c1
---

 libavcodec/roqvideodec.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 0ce6943..acdae75 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/imgutils.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
@@ -199,8 +201,9 @@ static int roq_decode_frame(AVCodecContext *avctx,
     }
 
     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);



More information about the ffmpeg-cvslog mailing list