[SCM] libav/experimental: avconv: explicitly report when the muxing overhead is unknown

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:23 UTC 2014


The following commit has been merged in the experimental branch:
commit f759f66e367bc62ed7738a51040f775b656a60d8
Author: Anton Khirnov <anton at khirnov.net>
Date:   Mon Mar 17 10:00:38 2014 +0100

    avconv: explicitly report when the muxing overhead is unknown

diff --git a/avconv.c b/avconv.c
index d4f336b..c8c33c6 100644
--- a/avconv.c
+++ b/avconv.c
@@ -858,17 +858,21 @@ static void print_report(int is_last_report, int64_t timer_start)
 
     if (is_last_report) {
         int64_t raw   = audio_size + video_size + extra_size;
-        float percent = 0.0;
+        float percent = -1.0;
 
         if (raw)
             percent = 100.0 * (total_size - raw) / raw;
 
         av_log(NULL, AV_LOG_INFO, "\n");
-        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
+        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead: ",
                video_size / 1024.0,
                audio_size / 1024.0,
                extra_size / 1024.0,
-               percent);
+        if (percent >= 0.0)
+            av_log(NULL, AV_LOG_INFO, "%f%%", percent);
+        else
+            av_log(NULL, AV_LOG_INFO, "unknown");
+        av_log(NULL, AV_LOG_INFO, "\n");
     }
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list