virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: drop the -vol option

Browse Source 
It has been deprecated in favor of the volume filter since 2012.
This commit is contained in:
Anton Khirnov
2022-06-19 14:44:55 +02:00
parent a04d83181a
commit 8cbf229c94
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@@ -2840,10 +2840,6 @@ static int init_output_stream_streamcopy(OutputStream *ost)
switch (par_dst->codec_type) { switch (par_dst->codec_type) {
case AVMEDIA_TYPE_AUDIO: 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) 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; par_dst->block_align= 0;
if(par_dst->codec_id == AV_CODEC_ID_AC3) if(par_dst->codec_id == AV_CODEC_ID_AC3)

10
fftools/ffmpeg_filter.c
View File

@@ -913,16 +913,6 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
// av_bprint_finalize(&pan_buf, NULL); // 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", snprintf(name, sizeof(name), "trim for input stream %d:%d",
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
if (copy_ts) { if (copy_ts) {

3
fftools/ffmpeg_opt.c
View File

@@ -157,7 +157,6 @@ float audio_drift_threshold = 0.1;
float dts_delta_threshold = 10; float dts_delta_threshold = 10;
float dts_error_threshold = 3600*30; float dts_error_threshold = 3600*30;
int audio_volume = 256;
int audio_sync_method = 0; int audio_sync_method = 0;
enum VideoSyncMethod video_sync_method = VSYNC_AUTO; enum VideoSyncMethod video_sync_method = VSYNC_AUTO;
float frame_drop_threshold = 0; float frame_drop_threshold = 0;
@@ -4029,8 +4028,6 @@ const OptionDef options[] = {
{ "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
OPT_OUTPUT, { .func_arg = opt_old2new }, OPT_OUTPUT, { .func_arg = opt_old2new },
"force audio tag/fourcc", "fourcc/tag" }, "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 | { "sample_fmt", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC |
OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(sample_fmts) }, OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(sample_fmts) },
"set sample format", "format" }, "set sample format", "format" },