diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 28f032df80..ab17d1d687 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1254,8 +1254,6 @@ Specify which version of the vstats format to use. Default is @code{2}. See the @item -vtag @var{fourcc/tag} (@emph{output}) Force video tag/fourcc. This is an alias for @code{-tag:v}. -@item -vbsf @var{bitstream_filter} -Deprecated see -bsf @item -force_key_frames[:@var{stream_specifier}] @var{time}[,@var{time}...] (@emph{output,per-stream}) @item -force_key_frames[:@var{stream_specifier}] expr:@var{expr} (@emph{output,per-stream}) @@ -1624,8 +1622,6 @@ This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter optio @table @option @item -atag @var{fourcc/tag} (@emph{output}) Force audio tag/fourcc. This is an alias for @code{-tag:a}. -@item -absf @var{bitstream_filter} -Deprecated, see -bsf @item -guess_layout_max @var{channels} (@emph{input,per-stream}) If some input channel layout is not known, try to guess only if it corresponds to at most the specified number of channels. For example, 2 diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 594a644dec..cf31106fe1 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1920,18 +1920,9 @@ const OptionDef options[] = { "0 = use frame rate (video) or sample rate (audio)," "-1 = match source time base", "ratio" }, - { "bsf", OPT_TYPE_STRING, OPT_SPEC | OPT_EXPERT | OPT_OUTPUT | OPT_HAS_ALT, + { "bsf", OPT_TYPE_STRING, OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(bitstream_filters) }, - "A comma-separated list of bitstream filters", "bitstream_filters", - .u1.names_alt = alt_bsf, }, - { "absf", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, - { .func_arg = opt_old2new }, - "deprecated", "audio bitstream_filters", - .u1.name_canon = "bsf", }, - { "vbsf", OPT_TYPE_FUNC, OPT_VIDEO | OPT_FUNC_ARG | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, - { .func_arg = opt_old2new }, - "deprecated", "video bitstream_filters", - .u1.name_canon = "bsf", }, + "A comma-separated list of bitstream filters", "bitstream_filters", }, { "apre", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_preset },