Branch: master

2897194b 2014-10-10 06:03:04 Slávek Banko
Fix FTBFS from commit 0e824732
M k9author/k9avidecode.cpp
diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp
index a3a23c6..3910ce9 100644
--- a/k9author/k9avidecode.cpp
+++ b/k9author/k9avidecode.cpp
@@ -9,6 +9,7 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+#include "config.h"
 #include "k9avidecode.h"
 
 #ifdef OLD_FFMPEG
@@ -117,8 +118,10 @@
 #   ifndef HAVE_SWSCALE
     img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
     //if img_convert is null (deprecated in ffmpeg), we need libswscale
-    if (!img_convert)
-        errs << i18n("Cannot open the library %1").arg("libswscale");
+    if (!img_convert) {
+        m_error = i18n("Cannot open the library %1").arg("libswscale");
+        return;
+    }
 #   endif
     av_free = (av_free_t)dlsym(CodecHandle,"av_free");
     av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");