RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1' 

* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1':
  roqvideodec: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-22 20:11:21 +02:00
parent 9a6f1eea3e f0a106578d
commit 42b87ed01e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/roqvideodec.c
View File

@ -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);