diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-11-14 15:56:20 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-11-17 10:52:58 +0100 |
| commit | b58264217b605d0e8f2ef1cf7d41396b6cb1617f (patch) | |
| tree | 634f87a7d5cf0ffd75f71797a30cae8bd62e08e0 /fftools | |
| parent | 13947aff3f7718c7985c73c52563d8dc6a3b1e24 (diff) | |
fftools/ffmpeg_mux_init: drop an always-false check
It cannot be true since 1959351aecf. Effectively reverts 6a3833e1411.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_demux.c | 2 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux_init.c | 6 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 5 |
4 files changed, 0 insertions, 14 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index b9262b373f..a96ff0d723 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -674,7 +674,6 @@ extern HWDevice *filter_hw_device; extern unsigned nb_output_dumped; extern int main_return_code; -extern int input_stream_potentially_available; extern int ignore_unknown_streams; extern int copy_unknown_streams; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index b3eb8c66cc..76778d774d 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1098,7 +1098,5 @@ int ifile_open(const OptionsContext *o, const char *filename) } } - input_stream_potentially_available = 1; - return 0; } diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 277cbd1f64..db45fa09fa 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1911,12 +1911,6 @@ int of_open(const OptionsContext *o, const char *filename) } } - if (!(oc->oformat->flags & AVFMT_NOSTREAMS) && !input_stream_potentially_available) { - av_log(NULL, AV_LOG_ERROR, - "No input streams but output needs an input stream\n"); - exit_program(1); - } - if (!(oc->oformat->flags & AVFMT_NOFILE)) { /* test if it already exists to avoid losing precious files */ assert_file_overwrite(filename); diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 5ab296828b..61aa0be0ab 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -95,7 +95,6 @@ static int no_file_overwrite = 0; #if FFMPEG_OPT_PSNR int do_psnr = 0; #endif -int input_stream_potentially_available = 0; int ignore_unknown_streams = 0; int copy_unknown_streams = 0; int recast_media = 0; @@ -1114,8 +1113,6 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg) if (!fg->graph_desc) return AVERROR(ENOMEM); - input_stream_potentially_available = 1; - return 0; } @@ -1130,8 +1127,6 @@ static int opt_filter_complex_script(void *optctx, const char *opt, const char * fg->index = nb_filtergraphs - 1; fg->graph_desc = graph_desc; - input_stream_potentially_available = 1; - return 0; } |