Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'

* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
  avconv: explicitly report when the muxing overhead is unknown

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg.c

@@ -1348,19 +1348,23 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
 
     if (is_last_report) {
         int64_t raw   = audio_size + video_size + data_size + subtitle_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 subtitle:%1.0f data:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
+        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f data:%1.0f global headers:%1.0fkB muxing overhead: ",
                video_size / 1024.0,
                audio_size / 1024.0,
                subtitle_size / 1024.0,
                data_size / 1024.0,
-               extra_size / 1024.0,
-               percent);
+               extra_size / 1024.0);
+        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");
         if(video_size + data_size + audio_size + subtitle_size + extra_size == 0){
             av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n");
         }