[FFmpeg-cvslog] vf_aspect: switch to filter_frame

Anton Khirnov git at videolan.org
Thu Nov 29 00:38:44 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 29 00:31:50 2012 +0100| [8f21cfc6b39d6a8994ea8280e962d2561c0224ad] | committer: Michael Niedermayer

vf_aspect: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f21cfc6b39d6a8994ea8280e962d2561c0224ad
---

 libavfilter/vf_aspect.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 76abbca..7869d22 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -80,13 +80,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *c
     return 0;
 }
 
-static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
 {
     AspectContext *aspect = link->dst->priv;
 
-    picref->video->sample_aspect_ratio = aspect->ratio;
-    link->cur_buf = NULL;
-    return ff_start_frame(link->dst->outputs[0], picref);
+    frame->video->sample_aspect_ratio = aspect->ratio;
+    return ff_filter_frame(link->dst->outputs[0], frame);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
@@ -129,8 +128,7 @@ static const AVFilterPad avfilter_vf_setdar_inputs[] = {
         .type             = AVMEDIA_TYPE_VIDEO,
         .config_props     = setdar_config_props,
         .get_video_buffer = ff_null_get_video_buffer,
-        .start_frame      = start_frame,
-        .end_frame        = ff_null_end_frame
+        .filter_frame     = filter_frame,
     },
     { NULL }
 };
@@ -185,8 +183,7 @@ static const AVFilterPad avfilter_vf_setsar_inputs[] = {
         .type             = AVMEDIA_TYPE_VIDEO,
         .config_props     = setsar_config_props,
         .get_video_buffer = ff_null_get_video_buffer,
-        .start_frame      = start_frame,
-        .end_frame        = ff_null_end_frame
+        .filter_frame     = filter_frame,
     },
     { NULL }
 };



More information about the ffmpeg-cvslog mailing list