diff options
| -rw-r--r-- | avconv.c | 7 | ||||
| -rw-r--r-- | cmdutils.c | 2 | ||||
| -rw-r--r-- | cmdutils_common_opts.h | 1 | ||||
| -rw-r--r-- | doc/avconv.texi | 4 | ||||
| -rw-r--r-- | doc/avtools-common-opts.texi | 2 |
5 files changed, 4 insertions, 12 deletions
@@ -2548,12 +2548,6 @@ static int transcode(OutputFile *output_files, return ret; } -static int opt_verbose(const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -loglevel\n", opt); - return 0; -} - static double parse_frame_aspect_ratio(const char *arg) { int x = 0, y = 0; @@ -3967,7 +3961,6 @@ static const OptionDef options[] = { { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, "when dumping packets, also dump the payload" }, { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" }, - { "v", HAS_ARG, {(void*)opt_verbose}, "deprecated, use -loglevel instead", "number" }, { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, diff --git a/cmdutils.c b/cmdutils.c index 2c37880d74..77bad25e33 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -335,6 +335,8 @@ static int locate_option(int argc, char **argv, const OptionDef *options, const void parse_loglevel(int argc, char **argv, const OptionDef *options) { int idx = locate_option(argc, argv, options, "loglevel"); + if (!idx) + idx = locate_option(argc, argv, options, "v"); if (idx && argv[idx + 1]) opt_loglevel("loglevel", argv[idx + 1]); } diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index 36b2e322e5..1158afab99 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -12,3 +12,4 @@ { "pix_fmts" , OPT_EXIT, {(void*)show_pix_fmts }, "show available pixel formats" }, { "sample_fmts", OPT_EXIT, {.func_arg = show_sample_fmts }, "show available audio sample formats" }, { "loglevel", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, + { "v", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, diff --git a/doc/avconv.texi b/doc/avconv.texi index 0abcc9d400..9faaee630d 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -154,10 +154,6 @@ To set the language of the second stream: avconv -i INPUT -metadata:s:1 language=eng OUTPUT @end example -@item -v @var{number} (@emph{global}) -This option is deprecated and has no effect, use -loglevel -to set verbosity level. - @item -target @var{type} (@emph{output}) Specify target file type (@code{vcd}, @code{svcd}, @code{dvd}, @code{dv}, @code{dv50}). @var{type} may be prefixed with @code{pal-}, @code{ntsc-} or diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index 634b152ccc..1824813a1e 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -101,7 +101,7 @@ Show available pixel formats. @item -sample_fmts Show available sample formats. -@item -loglevel @var{loglevel} +@item -loglevel @var{loglevel} | -v @var{loglevel} Set the logging level used by the library. @var{loglevel} is a number or a string containing one of the following values: @table @samp |