[FFmpeg-cvslog] lavf/dump: dump the vbv_delay with N/A instead of 18446744073709551615

Limin Wang git at videolan.org
Wed Aug 28 19:20:27 EEST 2019


ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Tue Aug 27 22:34:54 2019 +0800| [ffd65c8862e1cb9f49f71ab30640ac0e8bdfe7ce] | committer: Michael Niedermayer

lavf/dump: dump the vbv_delay with N/A instead of 18446744073709551615

How to check it:
./ffmpeg -f lavfi -i testsrc  -c:v mpeg2video  -f null  -
master:
  Side data:
        cpb: bitrate max/min/avg: 0/0/200000 buffer size: 0 vbv_delay:
        18446744073709551615
patch applied:
Side data:
      cpb: bitrate max/min/avg: 0/0/200000 buffer size: 0 vbv_delay: N/A

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffd65c8862e1cb9f49f71ab30640ac0e8bdfe7ce
---

 libavformat/dump.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavformat/dump.c b/libavformat/dump.c
index a3791a3020..56814ff7d2 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -321,13 +321,16 @@ static void dump_cpb(void *ctx, AVPacketSideData *sd)
 
     av_log(ctx, AV_LOG_INFO,
 #if FF_API_UNSANITIZED_BITRATES
-           "bitrate max/min/avg: %d/%d/%d buffer size: %d vbv_delay: %"PRIu64,
+           "bitrate max/min/avg: %d/%d/%d buffer size: %d ",
 #else
-           "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d vbv_delay: %"PRIu64,
+           "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d ",
 #endif
            cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate,
-           cpb->buffer_size,
-           cpb->vbv_delay);
+           cpb->buffer_size);
+    if (cpb->vbv_delay == UINT64_MAX)
+        av_log(ctx, AV_LOG_INFO, "vbv_delay: N/A");
+    else
+        av_log(ctx, AV_LOG_INFO, "vbv_delay: %"PRIu64"", cpb->vbv_delay);
 }
 
 static void dump_mastering_display_metadata(void *ctx, AVPacketSideData* sd) {



More information about the ffmpeg-cvslog mailing list