[FFmpeg-cvslog] ffmpeg: dont print "Conversion failed" if conversion has never started

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 23:45:22 2014 +0200| [ed72dae4cf80a3087f6ca050bc34facd1be3f98f] | committer: Michael Niedermayer

ffmpeg: dont print "Conversion failed" if conversion has never started

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed72dae4cf80a3087f6ca050bc34facd1be3f98f
---

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 6f90955..e7b4290 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();