diff options
| author | Nicolas George <george@nsup.org> | 2020-08-14 13:06:34 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2020-09-08 14:16:08 +0200 |
| commit | 697fb09e3dd187b76f1bc57516fcbe482b4d89e2 (patch) | |
| tree | 8c4c32e4c3cfae3ba0d3df6339781d92b1f18058 /fftools | |
| parent | 0d942357f6ea918473ab0140b8deb37af84b094d (diff) | |
| download | ffmpeg-697fb09e3dd187b76f1bc57516fcbe482b4d89e2.tar.gz | |
ffmpeg: add auto_conversion_filters option.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_filter.c | 2 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6e3f2545c7..908bc73fca 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -613,6 +613,7 @@ extern char *videotoolbox_pixfmt; extern int filter_nbthreads; extern int filter_complex_nbthreads; extern int vstats_version; +extern int auto_conversion_filters; extern const AVIOInterruptCB int_cb; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 4784e8a575..3c507f8c1d 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1104,6 +1104,8 @@ int configure_filtergraph(FilterGraph *fg) configure_output_filter(fg, fg->outputs[i], cur); avfilter_inout_free(&outputs); + if (!auto_conversion_filters) + avfilter_graph_set_auto_convert(fg->graph, AVFILTER_AUTO_CONVERT_NONE); if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) goto fail; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 853550a142..19f719e3ff 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -172,6 +172,7 @@ float max_error_rate = 2.0/3; int filter_nbthreads = 0; int filter_complex_nbthreads = 0; int vstats_version = 2; +int auto_conversion_filters = 1; static int intra_only = 0; @@ -3545,6 +3546,8 @@ const OptionDef options[] = { "create a complex filtergraph", "graph_description" }, { "filter_complex_script", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex_script }, "read complex filtergraph description from a file", "filename" }, + { "auto_conversion_filters", OPT_BOOL | OPT_EXPERT, { &auto_conversion_filters }, + "enable automatic conversion filters globally" }, { "stats", OPT_BOOL, { &print_stats }, "print progress report during encoding", }, { "attach", HAS_ARG | OPT_PERFILE | OPT_EXPERT | |