From d5a8c745a7d82f424cc013d9d4b4429aa8fa20e6 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 3 Apr 2022 17:24:40 +0200 Subject: [PATCH] ffmpeg: drop undocumented -d option Option was added in commit 39aafa5ee90e10382e but was never documented. Also does not seem there are current use cases for it, tests for which it was introduced are still working therefore we drop it altogether. Indirectly fix trac issue: http://trac.ffmpeg.org/ticket/1698 --- Changelog | 1 + fftools/ffmpeg.c | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Changelog b/Changelog index e173d43229..5bae61bad5 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,7 @@ version 5.1: - pcm-bluray encoder - DFPWM audio encoder/decoder and raw muxer/demuxer - SITI filter +- drop ffmpeg -d option version 5.0: diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6d62bdc7b0..f82ba8a175 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -132,7 +132,6 @@ static BenchmarkTimeStamps get_benchmark_time_stamps(void); static int64_t getmaxrss(void); static int ifilter_has_all_input_formats(FilterGraph *fg); -static int run_as_daemon = 0; static int nb_frames_dup = 0; static unsigned dup_warning = 1000; static int nb_frames_drop = 0; @@ -420,7 +419,7 @@ void term_init(void) #endif #if HAVE_TERMIOS_H - if (!run_as_daemon && stdin_interaction) { + if (stdin_interaction) { struct termios tty; if (tcgetattr (0, &tty) == 0) { oldtty = tty; @@ -3854,7 +3853,7 @@ static int check_keyboard_interaction(int64_t cur_time) if (received_nb_signals) return AVERROR_EXIT; /* read_key() returns 0 on EOF */ - if(cur_time - last_time >= 100000 && !run_as_daemon){ + if (cur_time - last_time >= 100000) { key = read_key(); last_time = cur_time; }else @@ -4864,13 +4863,6 @@ int main(int argc, char **argv) av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); - if(argc>1 && !strcmp(argv[1], "-d")){ - run_as_daemon=1; - av_log_set_callback(log_callback_null); - argc--; - argv++; - } - #if CONFIG_AVDEVICE avdevice_register_all(); #endif -- 2.25.1