| Message ID | 20230206181215.2577927-1-marth64@proxyid.net |
|---|---|
| State | Accepted |
| Commit | 25f31929b6ede49194ca9231560323829d4da67a |
| Headers | show |
| Series | [FFmpeg-devel] ffmpeg_opt: move help text for -ab/-b:a to audio category | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Quoting Marth64 (2023-02-06 19:12:15) > Since at least 4.4.3, -ab/-b:a help text was in the video section > of ffmpeg -h, but these are audio options. > > Signed-off-by: Marth64 <marth64@proxyid.net> > --- > fftools/ffmpeg_opt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c > index 204be38c94..799dcf071e 100644 > --- a/fftools/ffmpeg_opt.c > +++ b/fftools/ffmpeg_opt.c > @@ -1637,8 +1637,6 @@ const OptionDef options[] = { > { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | > OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(forced_key_frames) }, > "force key frames at specified timestamps", "timestamps" }, > - { "ab", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, > - "audio bitrate (please use -b:a)", "bitrate" }, > { "b", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, > "video bitrate (please use -b:v)", "bitrate" }, > { "hwaccel", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | > @@ -1680,6 +1678,8 @@ const OptionDef options[] = { > { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE | > OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_audio_codec }, > "force audio codec ('copy' to copy stream)", "codec" }, > + { "ab", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, > + "audio bitrate (please use -b:a)", "bitrate" }, > { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | > OPT_OUTPUT, { .func_arg = opt_old2new }, > "force audio tag/fourcc", "fourcc/tag" }, Looks ok, will push
Thank you On Wed, Feb 8, 2023 at 9:13 PM Anton Khirnov <anton@khirnov.net> wrote: > Quoting Marth64 (2023-02-06 19:12:15) > > Since at least 4.4.3, -ab/-b:a help text was in the video section > > of ffmpeg -h, but these are audio options. > > > > Signed-off-by: Marth64 <marth64@proxyid.net> > > --- > > fftools/ffmpeg_opt.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c > > index 204be38c94..799dcf071e 100644 > > --- a/fftools/ffmpeg_opt.c > > +++ b/fftools/ffmpeg_opt.c > > @@ -1637,8 +1637,6 @@ const OptionDef options[] = { > > { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT > | > > OPT_SPEC | OPT_OUTPUT, > { .off = OFFSET(forced_key_frames) }, > > "force key frames at specified timestamps", "timestamps" }, > > - { "ab", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, > { .func_arg = opt_bitrate }, > > - "audio bitrate (please use -b:a)", "bitrate" }, > > { "b", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, > { .func_arg = opt_bitrate }, > > "video bitrate (please use -b:v)", "bitrate" }, > > { "hwaccel", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT > | > > @@ -1680,6 +1678,8 @@ const OptionDef options[] = { > > { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE | > > OPT_INPUT | OPT_OUTPUT, > { .func_arg = opt_audio_codec }, > > "force audio codec ('copy' to copy stream)", "codec" }, > > + { "ab", OPT_AUDIO | HAS_ARG | OPT_PERFILE | > OPT_OUTPUT, { .func_arg = opt_bitrate }, > > + "audio bitrate (please use -b:a)", "bitrate" }, > > { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE > | > > OPT_OUTPUT, > { .func_arg = opt_old2new }, > > "force audio tag/fourcc", "fourcc/tag" }, > > Looks ok, will push > > -- > Anton Khirnov >
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 204be38c94..799dcf071e 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1637,8 +1637,6 @@ const OptionDef options[] = { { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(forced_key_frames) }, "force key frames at specified timestamps", "timestamps" }, - { "ab", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, - "audio bitrate (please use -b:a)", "bitrate" }, { "b", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, "video bitrate (please use -b:v)", "bitrate" }, { "hwaccel", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | @@ -1680,6 +1678,8 @@ const OptionDef options[] = { { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_audio_codec }, "force audio codec ('copy' to copy stream)", "codec" }, + { "ab", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, + "audio bitrate (please use -b:a)", "bitrate" }, { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new }, "force audio tag/fourcc", "fourcc/tag" },
Since at least 4.4.3, -ab/-b:a help text was in the video section of ffmpeg -h, but these are audio options. Signed-off-by: Marth64 <marth64@proxyid.net> --- fftools/ffmpeg_opt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)