Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

[ffmpeg] / libavfilter / vf_fps.c

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 8e7880cfe9ff36e744464b3951685a0be3c07fbf..d4305e727341ad2b7eec3b37d637be71104437b6 100644 (file)
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -74,16 +74,14 @@ AVFILTER_DEFINE_CLASS(fps);
 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FPSContext *s = ctx->priv;
+    const char *shorthand[] = { "fps", "round", NULL };
     int ret;
 
     s->class = &fps_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);
+    if ((ret = av_opt_set_from_string(s, args, shorthand, "=", ":")) < 0)
         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);