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

ffprobe: add -output_format as an alias of -of

Browse Source 
Currently we have -of and -print_format, which is a bit confusing. Add
-output_format as an alias of -of to match the short name.
This commit is contained in:
Stefano Sabatini 2023-10-15 11:25:23 +02:00
parent 0d11a6bc12
commit 7bf414408e
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -37,6 +37,7 @@ version <next>:
- VAAPI AV1 encoder - VAAPI AV1 encoder
- ffprobe XML output schema changed to account for multiple - ffprobe XML output schema changed to account for multiple
variable-fields elements within the same parent element variable-fields elements within the same parent element
- ffprobe -output_format option added as an alias of -of
version 6.0: version 6.0:

6
doc/ffprobe.texi
View File

@ -41,7 +41,7 @@ ffprobe will show it.
ffprobe output is designed to be easily parsable by a textual filter, ffprobe output is designed to be easily parsable by a textual filter,
and consists of one or more sections of a form defined by the selected and consists of one or more sections of a form defined by the selected
writer, which is specified by the @option{print_format} option. writer, which is specified by the @option{output_format} option.
Sections may contain other nested sections, and are identified by a Sections may contain other nested sections, and are identified by a
name (which may be shared by other sections), and an unique name (which may be shared by other sections), and an unique
@ -83,7 +83,7 @@ Use sexagesimal format HH:MM:SS.MICROSECONDS for time values.
Prettify the format of the displayed values, it corresponds to the Prettify the format of the displayed values, it corresponds to the
options "-unit -prefix -byte_binary_prefix -sexagesimal". options "-unit -prefix -byte_binary_prefix -sexagesimal".
@item -of, -print_format @var{writer_name}[=@var{writer_options}] @item -output_format, -of, -print_format @var{writer_name}[=@var{writer_options}]
Set the output printing format. Set the output printing format.
@var{writer_name} specifies the name of the writer, and @var{writer_name} specifies the name of the writer, and
@ -91,7 +91,7 @@ Set the output printing format.
For example for printing the output in JSON format, specify: For example for printing the output in JSON format, specify:
@example @example
-print_format json -output_format json
@end example @end example
For more details on the available output printing formats, see the For more details on the available output printing formats, see the

17
fftools/ffprobe.c
View File

@ -140,7 +140,7 @@ static int show_private_data = 1;
#define SHOW_OPTIONAL_FIELDS_ALWAYS 1 #define SHOW_OPTIONAL_FIELDS_ALWAYS 1
static int show_optional_fields = SHOW_OPTIONAL_FIELDS_AUTO; static int show_optional_fields = SHOW_OPTIONAL_FIELDS_AUTO;
static char *print_format; static char *output_format;
static char *stream_specifier; static char *stream_specifier;
static char *show_data_hash; static char *show_data_hash;
@ -4086,9 +4086,10 @@ static const OptionDef real_options[] = {
"use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" }, "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" },
{ "pretty", 0, {.func_arg = opt_pretty}, { "pretty", 0, {.func_arg = opt_pretty},
"prettify the format of displayed values, make it more human readable" }, "prettify the format of displayed values, make it more human readable" },
{ "print_format", OPT_STRING | HAS_ARG, { &print_format }, { "output_format", OPT_STRING | HAS_ARG, { &output_format },
"set the output printing format (available formats are: default, compact, csv, flat, ini, json, xml)", "format" }, "set the output printing format (available formats are: default, compact, csv, flat, ini, json, xml)", "format" },
{ "of", OPT_STRING | HAS_ARG, { &print_format }, "alias for -print_format", "format" }, { "print_format", OPT_STRING | HAS_ARG, { &output_format }, "alias for -output_format (deprecated)" },
{ "of", OPT_STRING | HAS_ARG, { &output_format }, "alias for -output_format", "format" },
{ "select_streams", OPT_STRING | HAS_ARG, { &stream_specifier }, "select the specified streams", "stream_specifier" }, { "select_streams", OPT_STRING | HAS_ARG, { &stream_specifier }, "select the specified streams", "stream_specifier" },
{ "sections", OPT_EXIT, {.func_arg = opt_sections}, "print sections structure and section information, and exit" }, { "sections", OPT_EXIT, {.func_arg = opt_sections}, "print sections structure and section information, and exit" },
{ "show_data", OPT_BOOL, { &do_show_data }, "show packets data" }, { "show_data", OPT_BOOL, { &do_show_data }, "show packets data" },
@ -4209,13 +4210,13 @@ int main(int argc, char **argv)
writer_register_all(); writer_register_all();
if (!print_format) if (!output_format)
print_format = av_strdup("default"); output_format = av_strdup("default");
if (!print_format) { if (!output_format) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
} }
w_name = av_strtok(print_format, "=", &buf); w_name = av_strtok(output_format, "=", &buf);
if (!w_name) { if (!w_name) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"No name specified for the output format\n"); "No name specified for the output format\n");
@ -4284,7 +4285,7 @@ int main(int argc, char **argv)
} }
end: end:
av_freep(&print_format); av_freep(&output_format);
av_freep(&read_intervals); av_freep(&read_intervals);
av_hash_freep(&hash); av_hash_freep(&hash);