[FFmpeg-cvslog] vf_fps: switch to an AVOptions-based system.

Anton Khirnov git at videolan.org
Wed Apr 10 19:27:35 CEST 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Feb 25 21:21:29 2013 +0100| [f13ab29925883b4245da4129694af3af378d67be] | committer: Anton Khirnov

vf_fps: switch to an AVOptions-based system.

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

 libavfilter/vf_fps.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 74e4d24..074dd5f 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -69,20 +69,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
     FPSContext *s = ctx->priv;
     int ret;
 
-    s->class = &class;
-    av_opt_set_defaults(s);
-
-    if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
-        av_log(ctx, AV_LOG_ERROR, "Error parsing the options string %s.\n",
-               args);
-        return ret;
-    }
-
     if ((ret = av_parse_video_rate(&s->framerate, s->fps)) < 0) {
         av_log(ctx, AV_LOG_ERROR, "Error parsing framerate %s.\n", s->fps);
         return ret;
     }
-    av_opt_free(s);
 
     if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFrame*))))
         return AVERROR(ENOMEM);
@@ -290,6 +280,7 @@ AVFilter avfilter_vf_fps = {
     .uninit    = uninit,
 
     .priv_size = sizeof(FPSContext),
+    .priv_class = &class,
 
     .inputs    = avfilter_vf_fps_inputs,
     .outputs   = avfilter_vf_fps_outputs,



More information about the ffmpeg-cvslog mailing list