diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 18:48:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 18:52:50 +0400 |
commit | 8a9878b4ff233abf59924355e5121cb03bbfb7cd (patch) | |
tree | 640407b2a674f1321d9d52cf942e31b11438745b /ffmpeg.c | |
parent | c31b3e3878e64c4d0e126024d3e4f6e2b6916d98 (diff) | |
parent | f759f66e367bc62ed7738a51040f775b656a60d8 (diff) |
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
avconv: explicitly report when the muxing overhead is unknown
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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"); } |