Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:11:21 +0000 (20:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:11:21 +0000 (20:11 +0200)
* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1':
  roqvideodec: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/roqvideodec.c

   *   http://www.csse.monash.edu.au/~timf/
   */
  
 -#include <stdio.h>
 -#include <stdlib.h>
 -#include <string.h>
 -
 +#include "libavutil/avassert.h"
+ #include "libavutil/imgutils.h"
  #include "avcodec.h"
  #include "bytestream.h"
  #include "internal.h"
@@@ -205,12 -195,15 +207,13 @@@ static int roq_decode_frame(AVCodecCont
      int copy= !s->current_frame->data[0];
      int ret;
  
 -    if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "  RoQ: get_buffer() failed\n");
 +    if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0)
          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);