From ed72dae4cf80a3087f6ca050bc34facd1be3f98f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 29 Apr 2014 23:45:22 +0200
Subject: ffmpeg: dont print "Conversion failed" if conversion has never
 started

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ffmpeg.c')

diff --git a/ffmpeg.c b/ffmpeg.c
index 6f909555f9..e7b42906a4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -517,7 +517,7 @@ static void ffmpeg_cleanup(int ret)
     if (received_sigterm) {
         av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
                (int) received_sigterm);
-    } else if (ret) {
+    } else if (ret && transcode_init_done) {
         av_log(NULL, AV_LOG_INFO, "Conversion failed!\n");
     }
     term_exit();
-- 
cgit v1.2.3