[SCM] libav/experimental: avconv: Do not divide by zero

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5c79d2e12d13959fc6aed92d102c25194a06de05
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Wed Feb 19 21:41:12 2014 +0100

    avconv: Do not divide by zero

diff --git a/avconv.c b/avconv.c
index edce1e5..64e8321 100644
--- a/avconv.c
+++ b/avconv.c
@@ -858,14 +858,18 @@ static void print_report(int is_last_report, int64_t timer_start)
     fflush(stderr);
 
     if (is_last_report) {
-        int64_t raw= audio_size + video_size + extra_size;
+        int64_t raw   = audio_size + video_size + extra_size;
+        float percent = 0.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",
                video_size / 1024.0,
                audio_size / 1024.0,
                extra_size / 1024.0,
-               100.0 * (total_size - raw) / raw
-        );
+               percent);
     }
 }
 

-- 
Libav/FFmpeg packaging