Use av_frame_copy() to simplify code where appropriate.
authorAnton Khirnov <anton@khirnov.net>
Tue, 11 Feb 2014 14:08:12 +0000 (15:08 +0100)
committerAnton Khirnov <anton@khirnov.net>
Mon, 24 Feb 2014 06:25:07 +0000 (07:25 +0100)
libavcodec/libwebpenc.c
libavfilter/vf_copy.c

index 74e73dc..b981f48 100644 (file)
@@ -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;
             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;
             frame = alt_frame;
         }
         pic->use_argb  = 0;
index 55175a0..5e60f20 100644 (file)
@@ -37,9 +37,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         return AVERROR(ENOMEM);
     }
     av_frame_copy_props(out, 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);
 }
     av_frame_free(&in);
     return ff_filter_frame(outlink, out);
 }