This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 07407fff6142f14dcb21b8a06d0d15db0e31135e Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 13:47:37 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:58 2026 +0200 fftools/ffmpeg: Remove deprecated -filter_complex_script option Deprecated in commit c316c4c77b1bac8e9a77000294d3e8cf0ca45dc7 on 2024-01-20. Signed-off-by: Andreas Rheinhardt <[email protected]> --- fftools/ffmpeg.h | 4 ---- fftools/ffmpeg_mux_init.c | 54 ++++++----------------------------------------- fftools/ffmpeg_opt.c | 35 ------------------------------ 3 files changed, 6 insertions(+), 87 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 844ba82119..141a09264b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -53,7 +53,6 @@ // deprecated features #define FFMPEG_OPT_VSYNC 1 -#define FFMPEG_OPT_FILTER_SCRIPT 1 #define FFMPEG_ERROR_RATE_EXCEEDED FFERRTAG('E', 'R', 'E', 'D') @@ -220,9 +219,6 @@ typedef struct OptionsContext { SpecifierOptList copy_initial_nonkeyframes; SpecifierOptList copy_prior_start; SpecifierOptList filters; -#if FFMPEG_OPT_FILTER_SCRIPT - SpecifierOptList filter_scripts; -#endif SpecifierOptList reinit_filters; SpecifierOptList drop_changed; SpecifierOptList fix_sub_duration; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 3e185f2175..9d301e6611 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -417,45 +417,19 @@ static int ost_get_filters(const OptionsContext *o, AVFormatContext *oc, OutputStream *ost, char **dst) { const char *filters = NULL; -#if FFMPEG_OPT_FILTER_SCRIPT - const char *filters_script = NULL; - - opt_match_per_stream_str(ost, &o->filter_scripts, oc, ost->st, &filters_script); -#endif opt_match_per_stream_str(ost, &o->filters, oc, ost->st, &filters); if (!ost->ist) { - if ( -#if FFMPEG_OPT_FILTER_SCRIPT - filters_script || -#endif - filters) { + if (filters) { av_log(ost, AV_LOG_ERROR, - "%s '%s' was specified for a stream fed from a complex " + "Filtergraph '%s' was specified for a stream fed from a complex " "filtergraph. Simple and complex filtering cannot be used " - "together for the same stream.\n", -#if FFMPEG_OPT_FILTER_SCRIPT - filters ? "Filtergraph" : "Filtergraph script", - filters ? filters : filters_script -#else - "Filtergraph", filters -#endif - ); + "together for the same stream.\n", filters); return AVERROR(EINVAL); } return 0; } -#if FFMPEG_OPT_FILTER_SCRIPT - if (filters_script && filters) { - av_log(ost, AV_LOG_ERROR, "Both -filter and -filter_script set\n"); - return AVERROR(EINVAL); - } - - if (filters_script) - *dst = read_file_to_string(filters_script); - else -#endif if (filters) *dst = av_strdup(filters); else @@ -1029,28 +1003,12 @@ static int streamcopy_init(const OptionsContext *o, const Muxer *mux, int ret = 0; const char *filters = NULL; -#if FFMPEG_OPT_FILTER_SCRIPT - const char *filters_script = NULL; - - opt_match_per_stream_str(ost, &o->filter_scripts, mux->fc, ost->st, &filters_script); -#endif opt_match_per_stream_str(ost, &o->filters, mux->fc, ost->st, &filters); - if ( -#if FFMPEG_OPT_FILTER_SCRIPT - filters_script || -#endif - filters) { + if (filters) { av_log(ost, AV_LOG_ERROR, - "%s '%s' was specified, but codec copy was selected. " - "Filtering and streamcopy cannot be used together.\n", -#if FFMPEG_OPT_FILTER_SCRIPT - filters ? "Filtergraph" : "Filtergraph script", - filters ? filters : filters_script -#else - "Filtergraph", filters -#endif - ); + "Filtergraph '%s' was specified, but codec copy was selected. " + "Filtering and streamcopy cannot be used together.\n", filters); return AVERROR(EINVAL); } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c97ddab552..57d58a8791 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1276,31 +1276,6 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg) return 0; } -#if FFMPEG_OPT_FILTER_SCRIPT -static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg) -{ - GlobalOptionsContext *go = optctx; - char *graph_desc; - int ret; - - graph_desc = read_file_to_string(arg); - if (!graph_desc) - return AVERROR(EINVAL); - - av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -/filter_complex %s instead\n", - opt, arg); - - ret = GROW_ARRAY(go->filtergraphs, go->nb_filtergraphs); - if (ret < 0) { - av_freep(&graph_desc); - return ret; - } - go->filtergraphs[go->nb_filtergraphs - 1] = graph_desc; - - return 0; -} -#endif - void show_help_default(const char *opt, const char *arg) { int show_advanced = 0, show_avoptions = 0; @@ -1797,11 +1772,6 @@ const OptionDef options[] = { { "filter_buffered_frames", OPT_TYPE_INT, OPT_EXPERT, { &filter_buffered_frames }, "maximum number of buffered frames in a filter graph" }, -#if FFMPEG_OPT_FILTER_SCRIPT - { "filter_script", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, - { .off = OFFSET(filter_scripts) }, - "deprecated, use -/filter", "filename" }, -#endif { "reinit_filter", OPT_TYPE_INT, OPT_PERSTREAM | OPT_INPUT | OPT_EXPERT, { .off = OFFSET(reinit_filters) }, "reinit filtergraph on input parameter changes", "" }, @@ -1817,11 +1787,6 @@ const OptionDef options[] = { { "lavfi", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex }, "create a complex filtergraph", "graph_description" }, -#if FFMPEG_OPT_FILTER_SCRIPT - { "filter_complex_script", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, - { .func_arg = opt_filter_complex_script }, - "deprecated, use -/filter_complex instead", "filename" }, -#endif { "print_graphs", OPT_TYPE_BOOL, 0, { &print_graphs }, "print execution graph data to stderr" }, _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
