aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schmidt <schmidt@digadd.de>2012-05-25 15:01:59 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-05-26 12:39:11 +0200
commitf7d5272456ff67d6af262bb220d2af68c85cbb92 (patch)
treec6ad128aeff1006936aaf0ed7a0554d98ea2d1cf
parent36f714f8256a876f4c5f04a70144eecb518a7196 (diff)
downloadffmpeg-f7d5272456ff67d6af262bb220d2af68c85cbb92.tar.gz
ffprobe: display the codec profile in show_stream()
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
-rw-r--r--doc/ffprobe.xsd1
-rw-r--r--ffprobe.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 3984b7dc2e..f8e9fe9809 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -83,6 +83,7 @@
<xsd:attribute name="index" type="xsd:int" use="required"/>
<xsd:attribute name="codec_name" type="xsd:string" />
<xsd:attribute name="codec_long_name" type="xsd:string" />
+ <xsd:attribute name="profile" type="xsd:string" />
<xsd:attribute name="codec_type" type="xsd:string" />
<xsd:attribute name="codec_time_base" type="xsd:string" use="required"/>
<xsd:attribute name="codec_tag" type="xsd:string" use="required"/>
diff --git a/ffprobe.c b/ffprobe.c
index d53ec11624..c98bdac3ff 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1364,6 +1364,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
print_int("index", stream->index);
if ((dec_ctx = stream->codec)) {
+ const char *profile = NULL;
if ((dec = dec_ctx->codec)) {
print_str("codec_name", dec->name);
print_str("codec_long_name", dec->long_name);
@@ -1372,6 +1373,11 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
print_str_opt("codec_long_name", "unknown");
}
+ if (dec && (profile = av_get_profile_name(dec, dec_ctx->profile)))
+ print_str("profile", profile);
+ else
+ print_str_opt("profile", "unknown");
+
s = av_get_media_type_string(dec_ctx->codec_type);
if (s) print_str ("codec_type", s);
else print_str_opt("codec_type", "unknown");