fixed graphics bug

[swftools.git] / avi2swf / avi2swf.cc

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index 29d65af..d0fd823 100644 (file)
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -305,9 +305,7 @@ int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
     img->ToYUV();
     img->ToRGB();
     if(img->Bpp() != 3) {
-       /* TODO: this doesn't work yet */
-       if(verbose) printf("Can't handle Bpp %d, shutting down...\n", img->Bpp());
-       return 0;
+       if(verbose) printf("Warning: converthing from bpp %d to bpp 3, this fails on older avifile versions...\n", img->Bpp());
        BitmapInfo tmp(v->width, v->height, 24);
        img2 = new CImage(img, &tmp);
        img = img2;
@@ -406,6 +404,12 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
        printf("Couldn't open video stream\n");
        i->do_audio = 0;
     }
+#ifdef NO_MP3
+    if(i->do_audio) {
+       printf(stderr, "MP3 support has been disabled at compile time, not converting soundtrack");
+       i->do_audio = 0;
+    }
+#endif
 
     if(!i->do_video && !i->do_audio) {
        printf("File has neither audio nor video streams.(?)\n");