Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'

* commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364':
  nuv: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index f3270cb19d..20bdeb4d34 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -75,9 +75,12 @@ static const uint8_t fallback_cquant[] = {
  */
 static void copy_frame(AVFrame *f, const uint8_t *src, int width, int height)
 {
-    AVPicture pic;
-    avpicture_fill(&pic, src, AV_PIX_FMT_YUV420P, width, height);
-    av_picture_copy((AVPicture *)f, &pic, AV_PIX_FMT_YUV420P, width, height);
+    uint8_t *src_data[4];
+    int src_linesize[4];
+    av_image_fill_arrays(src_data, src_linesize, src,
+                         f->format, width, height, 1);
+    av_image_copy(f->data, f->linesize, src_data, src_linesize,
+                  f->format, width, height);
 }
 
 /**