X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=9afdc4668cd96bf35f330b609f99dbc067c291d4;hb=aab59bee1b79b487e2a15ec57a80a857ffd623a5;hp=5da1945d083ea7b367d8cb033023f375827f0ad5;hpb=5b0f171d461fac3d379022d195cafe1992243466;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 5da1945..9afdc46 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -100,13 +100,8 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
     if(global.do_cgi) {
 	if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
     } else {
-	if(global.version >= 6) {
-	    if (swf_WriteSWC(f, swf)<0) 
-		    fprintf(stderr, "Unable to write output file: %s\n", sname);
-	} else {
-	    if (swf_WriteSWF(f, swf)<0) 
-		    fprintf(stderr, "Unable to write output file: %s\n", sname);
-	}
+        if (swf_WriteSWF(f, swf)<0) 
+            fprintf(stderr, "Unable to write output file: %s\n", sname);
 	if (f != so)
 	    close(f);
     }
@@ -756,7 +751,14 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 
     int width=0, height=0;
 
+#ifndef HAVE_JPEGLIB
+    if(global.mkjpeg) {
+        global.mkjpeg = 0;
+        msg("<warning> No jpeg support compiled in");
+    }
+#endif
     if(global.mkjpeg) {
+#ifdef HAVE_JPEGLIB
 	RGBA*data = 0;
 	getPNG(sname, &width, &height, (unsigned char**)&data);
 	if(!data) 
@@ -770,6 +772,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    swf_SetU16(t, id);
 	    swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
 	}
+#endif
     } else if(1) {
 	RGBA*data = 0;
 	getPNG(sname, &width, &height, (unsigned char**)&data);