diff options
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/version.h | 2 | ||||
-rw-r--r-- | libavfilter/vf_fade.c | 45 |
2 files changed, 8 insertions, 39 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 9f1f8bfc58..7b13964054 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 32 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index f395fd8717..ee3c0c2d34 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -78,41 +78,14 @@ AVFILTER_DEFINE_CLASS(fade); static av_cold int init(AVFilterContext *ctx, const char *args) { FadeContext *fade = ctx->priv; - int ret = 0; - char *args1, *expr, *bufptr = NULL; + static const char *shorthand[] = { "type", "start_frame", "nb_frames", NULL }; + int ret; fade->class = &fade_class; av_opt_set_defaults(fade); - if (!(args1 = av_strdup(args))) { - ret = AVERROR(ENOMEM); - goto end; - } - - if (expr = av_strtok(args1, ":", &bufptr)) { - av_free(fade->type); - if (!(fade->type = av_strdup(expr))) { - ret = AVERROR(ENOMEM); - goto end; - } - } - if (expr = av_strtok(NULL, ":", &bufptr)) { - if ((ret = av_opt_set(fade, "start_frame", expr, 0)) < 0) { - av_log(ctx, AV_LOG_ERROR, - "Invalid value '%s' for start_frame option\n", expr); - goto end; - } - } - if (expr = av_strtok(NULL, ":", &bufptr)) { - if ((ret = av_opt_set(fade, "nb_frames", expr, 0)) < 0) { - av_log(ctx, AV_LOG_ERROR, - "Invalid value '%s' for nb_frames option\n", expr); - goto end; - } - } - - if (bufptr && (ret = av_set_options_string(fade, bufptr, "=", ":")) < 0) - goto end; + if ((ret = av_opt_set_from_string(fade, args, shorthand, "=", ":")) < 0) + return ret; fade->fade_per_frame = (1 << 16) / fade->nb_frames; if (!strcmp(fade->type, "in")) @@ -123,25 +96,21 @@ static av_cold int init(AVFilterContext *ctx, const char *args) } else { av_log(ctx, AV_LOG_ERROR, "Type argument must be 'in' or 'out' but '%s' was specified\n", fade->type); - ret = AVERROR(EINVAL); - goto end; + return AVERROR(EINVAL); } fade->stop_frame = fade->start_frame + fade->nb_frames; av_log(ctx, AV_LOG_VERBOSE, "type:%s start_frame:%d nb_frames:%d alpha:%d\n", fade->type, fade->start_frame, fade->nb_frames, fade->alpha); - -end: - av_free(args1); - return ret; + return 0; } static av_cold void uninit(AVFilterContext *ctx) { FadeContext *fade = ctx->priv; - av_freep(&fade->type); + av_opt_free(fade); } static int query_formats(AVFilterContext *ctx) |