ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Fri Oct 23 15:24:11 2015 +0200| [9cbae3a7d57bd2b862c37fd8123bd1fba680e801] | committer: Vittorio Giovara
roqvideodec: use av_frame_copy CC: libav-sta...@libav.org Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cbae3a7d57bd2b862c37fd8123bd1fba680e801 --- libavcodec/roqvideodec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index acdae75..f7b32f5 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -192,7 +192,7 @@ static int roq_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; RoqContext *s = avctx->priv_data; - int copy= !s->current_frame->data[0]; + int copy = !s->current_frame->data[0] && s->last_frame->data[0]; int ret; if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0) { @@ -200,10 +200,11 @@ static int roq_decode_frame(AVCodecContext *avctx, return ret; } - if(copy) - 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); + if (copy) { + ret = av_frame_copy(s->current_frame, s->last_frame); + if (ret < 0) + return ret; + } bytestream2_init(&s->gb, buf, buf_size); roqvideo_decode_frame(s); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
