diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-06-19 14:44:55 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-07-28 16:37:16 +0200 |
| commit | 8cbf229c941b3c77a756bff05d0ceb5f4f2219c5 (patch) | |
| tree | b8da0e8d1f9aaaf2bfc446934535777692b52ffc | |
| parent | a04d83181acf67c408f93092da27278be1d2c4a3 (diff) | |
fftools/ffmpeg: drop the -vol option
It has been deprecated in favor of the volume filter since 2012.
| -rw-r--r-- | fftools/ffmpeg.c | 4 | ||||
| -rw-r--r-- | fftools/ffmpeg_filter.c | 10 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9b50c8b26c..497b8982f4 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2840,10 +2840,6 @@ static int init_output_stream_streamcopy(OutputStream *ost) switch (par_dst->codec_type) { case AVMEDIA_TYPE_AUDIO: - if (audio_volume != 256) { - av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n"); - exit_program(1); - } if((par_dst->block_align == 1 || par_dst->block_align == 1152 || par_dst->block_align == 576) && par_dst->codec_id == AV_CODEC_ID_MP3) par_dst->block_align= 0; if(par_dst->codec_id == AV_CODEC_ID_AC3) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f715ecb6b6..6807bf384a 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -913,16 +913,6 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, // av_bprint_finalize(&pan_buf, NULL); // } - if (audio_volume != 256) { - char args[256]; - - av_log(NULL, AV_LOG_WARNING, "-vol has been deprecated. Use the volume " - "audio filter instead.\n"); - - snprintf(args, sizeof(args), "%f", audio_volume / 256.); - AUTO_INSERT_FILTER_INPUT("-vol", "volume", args); - } - snprintf(name, sizeof(name), "trim for input stream %d:%d", ist->file_index, ist->st->index); if (copy_ts) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8ac73c0efc..81754f7d91 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -157,7 +157,6 @@ float audio_drift_threshold = 0.1; float dts_delta_threshold = 10; float dts_error_threshold = 3600*30; -int audio_volume = 256; int audio_sync_method = 0; enum VideoSyncMethod video_sync_method = VSYNC_AUTO; float frame_drop_threshold = 0; @@ -4029,8 +4028,6 @@ const OptionDef options[] = { { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new }, "force audio tag/fourcc", "fourcc/tag" }, - { "vol", OPT_AUDIO | HAS_ARG | OPT_INT, { &audio_volume }, - "change audio volume (256=normal)" , "volume" }, { "sample_fmt", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(sample_fmts) }, "set sample format", "format" }, |