aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@smartjog.com>2012-02-06 11:58:14 +0100
committerStefano Sabatini <stefasab@gmail.com>2012-02-20 17:46:26 +0100
commit278d6ab90041cb52fb76a84dcff062db8c2398e2 (patch)
treeece79b193f916f53b48f349a633d4a48d1423858
parent3293b1adca637c29d555b4980d4f0f9cfe7fba78 (diff)
downloadffmpeg-278d6ab90041cb52fb76a84dcff062db8c2398e2.tar.gz
ffprobe: report bit rate in stream description
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
-rw-r--r--doc/ffprobe.xsd1
-rw-r--r--ffprobe.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index e7104ef351..3984b7dc2e 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -110,6 +110,7 @@
<xsd:attribute name="time_base" type="xsd:string" use="required"/>
<xsd:attribute name="start_time" type="xsd:float"/>
<xsd:attribute name="duration" type="xsd:float"/>
+ <xsd:attribute name="bit_rate" type="xsd:int"/>
<xsd:attribute name="nb_frames" type="xsd:int"/>
<xsd:attribute name="nb_read_frames" type="xsd:int"/>
<xsd:attribute name="nb_read_packets" type="xsd:int"/>
diff --git a/ffprobe.c b/ffprobe.c
index f4174fae5e..21e81c81aa 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1509,6 +1509,8 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
print_fmt("time_base", "%d/%d", stream->time_base.num, stream->time_base.den);
print_time("start_time", stream->start_time, &stream->time_base);
print_time("duration", stream->duration, &stream->time_base);
+ if (dec_ctx->bit_rate > 0) print_val ("bit_rate", dec_ctx->bit_rate, unit_bit_per_second_str);
+ else print_str_opt("bit_rate", "N/A");
if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames);
else print_str_opt("nb_frames", "N/A");
if (nb_streams_frames[stream_idx]) print_fmt ("nb_read_frames", "%"PRIu64, nb_streams_frames[stream_idx]);