aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-02-11 15:08:12 +0100
committerAnton Khirnov <anton@khirnov.net>2014-02-24 07:25:07 +0100
commit30517a9f056c8d01b3790871db4aee95d9c176e6 (patch)
treeea6c15294c71b790d2fa9b4139095a901080824c
parent8feac29cc46270cc89d6016340e7bac780877131 (diff)
downloadffmpeg-30517a9f056c8d01b3790871db4aee95d9c176e6.tar.gz
Use av_frame_copy() to simplify code where appropriate.
-rw-r--r--libavcodec/libwebpenc.c4
-rw-r--r--libavfilter/vf_copy.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c
index 74e73dc8cb..b981f48245 100644
--- a/libavcodec/libwebpenc.c
+++ b/libavcodec/libwebpenc.c
@@ -161,9 +161,7 @@ static int libwebp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ret = av_frame_get_buffer(alt_frame, 32);
if (ret < 0)
goto end;
- av_image_copy(alt_frame->data, alt_frame->linesize,
- frame->data, frame->linesize,
- avctx->pix_fmt, frame->width, frame->height);
+ av_frame_copy(alt_frame, frame);
frame = alt_frame;
}
pic->use_argb = 0;
diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c
index 55175a08c8..5e60f2082e 100644
--- a/libavfilter/vf_copy.c
+++ b/libavfilter/vf_copy.c
@@ -37,9 +37,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return AVERROR(ENOMEM);
}
av_frame_copy_props(out, in);
- av_image_copy(out->data, out->linesize, in->data, in->linesize,
- in->format, in->width, in->height);
-
+ av_frame_copy(out, in);
av_frame_free(&in);
return ff_filter_frame(outlink, out);
}