Skip to content
Snippets Groups Projects
Commit d8947523 authored by Anton Khirnov's avatar Anton Khirnov
Browse files

avprobe: don't print format entry name when only one was requested

This is easier to parse with automated tools.
parent 6ce51a9b
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,7 @@ const int program_birth_year = 2007; ...@@ -34,6 +34,7 @@ const int program_birth_year = 2007;
static int do_show_format = 0; static int do_show_format = 0;
static AVDictionary *fmt_entries_to_show = NULL; static AVDictionary *fmt_entries_to_show = NULL;
static int nb_fmt_entries_to_show;
static int do_show_packets = 0; static int do_show_packets = 0;
static int do_show_streams = 0; static int do_show_streams = 0;
...@@ -269,7 +270,9 @@ static void print_format_entry(const char *tag, ...@@ -269,7 +270,9 @@ static void print_format_entry(const char *tag,
printf("%s\n", val); printf("%s\n", val);
} }
} else if (tag && av_dict_get(fmt_entries_to_show, tag, NULL, 0)) { } else if (tag && av_dict_get(fmt_entries_to_show, tag, NULL, 0)) {
printf("%s=%s\n", tag, val); if (nb_fmt_entries_to_show > 1)
printf("%s=", tag);
printf("%s\n", val);
} }
} }
...@@ -408,6 +411,7 @@ static int opt_format(const char *opt, const char *arg) ...@@ -408,6 +411,7 @@ static int opt_format(const char *opt, const char *arg)
static int opt_show_format_entry(const char *opt, const char *arg) static int opt_show_format_entry(const char *opt, const char *arg)
{ {
do_show_format = 1; do_show_format = 1;
nb_fmt_entries_to_show++;
av_dict_set(&fmt_entries_to_show, arg, "", 0); av_dict_set(&fmt_entries_to_show, arg, "", 0);
return 0; return 0;
} }
......
FATE_PROBE_FORMAT += fate-probe-format-roundup997 FATE_PROBE_FORMAT += fate-probe-format-roundup997
fate-probe-format-roundup997: REF = format_name=mpeg fate-probe-format-roundup997: REF = mpeg
FATE_PROBE_FORMAT += fate-probe-format-roundup1383 FATE_PROBE_FORMAT += fate-probe-format-roundup1383
fate-probe-format-roundup1383: REF = format_name=mp3 fate-probe-format-roundup1383: REF = mp3
FATE_PROBE_FORMAT += fate-probe-format-roundup1414 FATE_PROBE_FORMAT += fate-probe-format-roundup1414
fate-probe-format-roundup1414: REF = format_name=mpeg fate-probe-format-roundup1414: REF = mpeg
FATE_PROBE_FORMAT += fate-probe-format-roundup2015 FATE_PROBE_FORMAT += fate-probe-format-roundup2015
fate-probe-format-roundup2015: REF = format_name=dv fate-probe-format-roundup2015: REF = dv
FATE-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT) FATE-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT)
fate-probe-format: $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment