Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
d8947523
Commit
d8947523
authored
12 years ago
by
Anton Khirnov
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
avprobe.c
+5
-1
5 additions, 1 deletion
avprobe.c
tests/fate/probe.mak
+4
-4
4 additions, 4 deletions
tests/fate/probe.mak
with
9 additions
and
5 deletions
avprobe.c
+
5
−
1
View file @
d8947523
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/fate/probe.mak
+
4
−
4
View file @
d8947523
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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment