Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'

* commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba':
  rawenc: Replace avpicture functions with imgutils

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

diff --cc libavcodec/rawenc.c
index c23225f,60bd0c7..b8eabd8
--- 1/libavcodec/rawenc.c
--- 2/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@@ -49,15 -51,18 +50,18 @@@ FF_ENABLE_DEPRECATION_WARNING
  static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
                        const AVFrame *frame, int *got_packet)
  {
-     int ret = avpicture_get_size(frame->format, frame->width, frame->height);
 -    int ret = av_image_get_buffer_size(avctx->pix_fmt,
 -                                       avctx->width, avctx->height, 1);
++    int ret = av_image_get_buffer_size(frame->format,
++                                       frame->width, frame->height, 1);
  
      if (ret < 0)
          return ret;
  
 -    if ((ret = ff_alloc_packet(pkt, ret)) < 0)
 +    if ((ret = ff_alloc_packet2(avctx, pkt, ret, ret)) < 0)
          return ret;
-     if ((ret = avpicture_layout((const AVPicture *)frame, frame->format, frame->width,
-                                 frame->height, pkt->data, pkt->size)) < 0)
+     if ((ret = av_image_copy_to_buffer(pkt->data, pkt->size,
+                                        frame->data, frame->linesize,
+                                        frame->format,
+                                        frame->width, frame->height, 1)) < 0)
          return ret;
  
      if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 &&