summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-02-11 14:59:00 +0100
committerAnton Khirnov <anton@khirnov.net>2014-02-24 07:25:07 +0100
commit8feac29cc46270cc89d6016340e7bac780877131 (patch)
treea43dabd281bf1252d5798df443105a6beac198ad /libavcodec/utils.c
parent1155fd02ae7bac215acab316e847c6bb25f74fc3 (diff)
lavc: use AVFrame API properly in ff_reget_buffer()
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b2b11ef841..c88b34649f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -754,7 +754,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
{
- AVFrame tmp;
+ AVFrame *tmp;
int ret;
av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO);
@@ -768,18 +768,20 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
return 0;
}
- av_frame_move_ref(&tmp, frame);
+ tmp = av_frame_alloc();
+ if (!tmp)
+ return AVERROR(ENOMEM);
+
+ av_frame_move_ref(tmp, frame);
ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
if (ret < 0) {
- av_frame_unref(&tmp);
+ av_frame_free(&tmp);
return ret;
}
- av_image_copy(frame->data, frame->linesize, tmp.data, tmp.linesize,
- frame->format, frame->width, frame->height);
-
- av_frame_unref(&tmp);
+ av_frame_copy(frame, tmp);
+ av_frame_free(&tmp);
return 0;
}