aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-06-17 17:16:48 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-06-18 09:39:17 +0200
commitc49e960a60398cdc044cbf83f65ef5146980029e (patch)
tree7642d45f6114868a992bbfa4dad9c7d16e227f98
parent9ae3e4552127a48133d05c531c867913c722b78a (diff)
downloadffmpeg-c49e960a60398cdc044cbf83f65ef5146980029e.tar.gz
ffprobe: dump AVPacket.convergence_duration.
-rw-r--r--doc/ffprobe.xsd2
-rw-r--r--ffprobe.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 7f12a364d8..3a4a8cce2b 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -39,6 +39,8 @@
<xsd:attribute name="dts_time" type="xsd:float" />
<xsd:attribute name="duration" type="xsd:long" />
<xsd:attribute name="duration_time" type="xsd:float" />
+ <xsd:attribute name="convergence_duration" type="xsd:long" />
+ <xsd:attribute name="convergence_duration_time" type="xsd:float" />
<xsd:attribute name="size" type="xsd:long" use="required" />
<xsd:attribute name="pos" type="xsd:long" />
<xsd:attribute name="flags" type="xsd:string" use="required" />
diff --git a/ffprobe.c b/ffprobe.c
index 0e34f6bcb5..f65e4602df 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1581,6 +1581,8 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk
print_time("dts_time", pkt->dts, &st->time_base);
print_duration_ts("duration", pkt->duration);
print_duration_time("duration_time", pkt->duration, &st->time_base);
+ print_duration_ts("convergence_duration", pkt->convergence_duration);
+ print_duration_time("convergence_duration_time", pkt->convergence_duration, &st->time_base);
print_val("size", pkt->size, unit_byte_str);
if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos);
else print_str_opt("pos", "N/A");