diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-11 19:19:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-19 19:20:14 +0200 |
| commit | 79600a83543afd7c485e30e1e9958765aadf7882 (patch) | |
| tree | ba880e812db399d2e9de3f8f73e47e8213b62b84 | |
| parent | 8fc83fb081963001e1197c6fdd59fd2af415078a (diff) | |
| download | ffmpeg-79600a83543afd7c485e30e1e9958765aadf7882.tar.gz | |
avconv: deprecate -isync.
This option does not do anything.
Also remove OPT_GRAB, since -isync is the last option using it.
| -rw-r--r-- | avconv_opt.c | 20 | ||||
| -rw-r--r-- | cmdutils.h | 1 | ||||
| -rw-r--r-- | doc/avconv.texi | 7 |
3 files changed, 8 insertions, 20 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index e133278582..295cc27ba3 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1795,28 +1795,24 @@ static int show_help(const char *opt, const char *arg) av_log_set_callback(log_callback_help); show_usage(); show_help_options(options, "Main options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0); + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, 0); show_help_options(options, "\nAdvanced options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, OPT_EXPERT); show_help_options(options, "\nVideo options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_VIDEO); show_help_options(options, "\nAdvanced Video options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_VIDEO | OPT_EXPERT); show_help_options(options, "\nAudio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_AUDIO); show_help_options(options, "\nAdvanced Audio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_AUDIO | OPT_EXPERT); show_help_options(options, "\nSubtitle options:\n", - OPT_SUBTITLE | OPT_GRAB, - OPT_SUBTITLE); - show_help_options(options, "\nAudio/Video grab options:\n", - OPT_GRAB, - OPT_GRAB); + OPT_SUBTITLE, OPT_SUBTITLE); printf("\n"); show_help_children(avcodec_get_class(), flags); show_help_children(avformat_get_class(), flags); @@ -2008,7 +2004,7 @@ const OptionDef options[] = { , "force subtitle tag/fourcc", "fourcc/tag" }, /* grab options */ - { "isync", OPT_BOOL | OPT_EXPERT | OPT_GRAB, { &input_sync }, "sync read on input", "" }, + { "isync", OPT_BOOL | OPT_EXPERT, { &input_sync }, "this option is deprecated and does nothing", "" }, /* muxer options */ { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_max_delay) }, diff --git a/cmdutils.h b/cmdutils.h index a02d19d3be..6fb5a35093 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -130,7 +130,6 @@ typedef struct { #define OPT_STRING 0x0008 #define OPT_VIDEO 0x0010 #define OPT_AUDIO 0x0020 -#define OPT_GRAB 0x0040 #define OPT_INT 0x0080 #define OPT_FLOAT 0x0100 #define OPT_SUBTITLE 0x0200 diff --git a/doc/avconv.texi b/doc/avconv.texi index fc6402820b..9f06ddfeb2 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -595,13 +595,6 @@ Set the subtitle codec. This is an alias for @code{-codec:s}. Disable subtitle recording. @end table -@section Audio/Video grab options - -@table @option -@item -isync (@emph{global}) -Synchronize read on input. -@end table - @section Advanced options @table @option |