[FFmpeg-cvslog] lavfi/vf_decimate: use standard options parsing.

Nicolas George git at videolan.org
Wed Mar 20 21:55:45 CET 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Mar 16 21:08:06 2013 +0100| [40ecd44f00dc5e10db36b87cd7f728da13256ba2] | committer: Nicolas George

lavfi/vf_decimate: use standard options parsing.

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

 libavfilter/vf_decimate.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index f0e49c9..630f3ba 100644
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -132,14 +132,6 @@ static int decimate_frame(AVFilterContext *ctx,
 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     DecimateContext *decimate = ctx->priv;
-    static const char *shorthand[] = { "max", "hi", "lo", "frac", NULL };
-    int ret;
-
-    decimate->class = &decimate_class;
-    av_opt_set_defaults(decimate);
-
-    if ((ret = av_opt_set_from_string(decimate, args, shorthand, "=", ":")) < 0)
-        return ret;
 
     av_log(ctx, AV_LOG_VERBOSE, "max_drop_count:%d hi:%d lo:%d frac:%f\n",
            decimate->max_drop_count, decimate->hi, decimate->lo, decimate->frac);
@@ -157,7 +149,6 @@ static av_cold void uninit(AVFilterContext *ctx)
     DecimateContext *decimate = ctx->priv;
     av_frame_free(&decimate->ref);
     avcodec_close(decimate->avctx);
-    av_opt_free(decimate);
     av_freep(&decimate->avctx);
 }
 
@@ -251,6 +242,8 @@ static const AVFilterPad decimate_outputs[] = {
     { NULL }
 };
 
+static const char *const shorthand[] = { "max", "hi", "lo", "frac", NULL };
+
 AVFilter avfilter_vf_decimate = {
     .name        = "decimate",
     .description = NULL_IF_CONFIG_SMALL("Remove near-duplicate frames."),
@@ -262,4 +255,5 @@ AVFilter avfilter_vf_decimate = {
     .inputs        = decimate_inputs,
     .outputs       = decimate_outputs,
     .priv_class    = &decimate_class,
+    .shorthand     = shorthand,
 };



More information about the ffmpeg-cvslog mailing list