X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fvideoreader_avifile.cc;h=487404c6c0cafcb756be26acf72fbf2f26209e01;hb=f8e8408f984b72dd90467f9c46ede4767139b189;hp=0cd2599beafaa788f4dc8933a3847633b50ef4d2;hpb=d6b5ebb01904d445f6ed9e00a54ca5e1e6c800cd;p=swftools.git

diff --git a/avi2swf/videoreader_avifile.cc b/avi2swf/videoreader_avifile.cc
index 0cd2599..487404c 100644
--- a/avi2swf/videoreader_avifile.cc
+++ b/avi2swf/videoreader_avifile.cc
@@ -23,6 +23,9 @@
 #include <stdio.h>
 #include <memory.h>
 #include "../config.h"
+#include "videoreader.h"
+
+#ifdef HAVE_AVIFILE
 
 #undef HAVE_CONFIG_H
 
@@ -59,7 +62,6 @@
 #endif
 
 #include "../lib/q.h"
-#include "videoreader.h"
 
 static int shutdown_avi2swf = 0;
 static int verbose = 0;
@@ -210,6 +212,10 @@ static void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*va
 
 int videoreader_avifile_open(videoreader_t* v, char* filename)
 {
+    if(!filename) {
+	/* codec query */
+	return 0;
+    }
     videoreader_avifile_internal* i;
     i = (videoreader_avifile_internal*)malloc(sizeof(videoreader_avifile_internal));
     memset(i, 0, sizeof(videoreader_avifile_internal));
@@ -252,7 +258,7 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 
     if(!i->do_video && !i->do_audio) {
 	printf("File has neither audio nor video streams.(?)\n");
-	return 0;
+	return -1;
     }
 
 #ifndef VERSION6
@@ -323,6 +329,14 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 #endif
     }
 
-    return 1;
+    return 0;
+}
+
+#else  //HAVE_AVIFILE
+
+int videoreader_avifile_open(videoreader_t* v, char* filename)
+{
+    return -1;
 }
 
+#endif //HAVE_AVIFILE