virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avconv: deprecate -isync.

Browse Source 
This option does not do anything.

Also remove OPT_GRAB, since -isync is the last option using it.
This commit is contained in:
Anton Khirnov 2012-08-11 19:19:53 +02:00
parent 8fc83fb081
commit 79600a8354
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
avconv_opt.c
View File

@ -1795,28 +1795,24 @@ static int show_help(const char *opt, const char *arg)
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
show_usage(); show_usage();
show_help_options(options, "Main options:\n", 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", 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); OPT_EXPERT);
show_help_options(options, "\nVideo options:\n", show_help_options(options, "\nVideo options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_VIDEO); OPT_VIDEO);
show_help_options(options, "\nAdvanced Video options:\n", 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); OPT_VIDEO | OPT_EXPERT);
show_help_options(options, "\nAudio options:\n", show_help_options(options, "\nAudio options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_AUDIO); OPT_AUDIO);
show_help_options(options, "\nAdvanced Audio options:\n", 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); OPT_AUDIO | OPT_EXPERT);
show_help_options(options, "\nSubtitle options:\n", show_help_options(options, "\nSubtitle options:\n",
OPT_SUBTITLE | OPT_GRAB, OPT_SUBTITLE, OPT_SUBTITLE);
OPT_SUBTITLE);
show_help_options(options, "\nAudio/Video grab options:\n",
OPT_GRAB,
OPT_GRAB);
printf("\n"); printf("\n");
show_help_children(avcodec_get_class(), flags); show_help_children(avcodec_get_class(), flags);
show_help_children(avformat_get_class(), flags); show_help_children(avformat_get_class(), flags);
@ -2008,7 +2004,7 @@ const OptionDef options[] = {
, "force subtitle tag/fourcc", "fourcc/tag" }, , "force subtitle tag/fourcc", "fourcc/tag" },
/* grab options */ /* 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 */ /* muxer options */
{ "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_max_delay) }, { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_max_delay) },

1
cmdutils.h
View File

@ -130,7 +130,6 @@ typedef struct {
#define OPT_STRING 0x0008 #define OPT_STRING 0x0008
#define OPT_VIDEO 0x0010 #define OPT_VIDEO 0x0010
#define OPT_AUDIO 0x0020 #define OPT_AUDIO 0x0020
#define OPT_GRAB 0x0040
#define OPT_INT 0x0080 #define OPT_INT 0x0080
#define OPT_FLOAT 0x0100 #define OPT_FLOAT 0x0100
#define OPT_SUBTITLE 0x0200 #define OPT_SUBTITLE 0x0200

7
doc/avconv.texi
View File

@ -595,13 +595,6 @@ Set the subtitle codec. This is an alias for @code{-codec:s}.
Disable subtitle recording. Disable subtitle recording.
@end table @end table
@section Audio/Video grab options
@table @option
@item -isync (@emph{global})
Synchronize read on input.
@end table
@section Advanced options @section Advanced options
@table @option @table @option