X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=b794e7c577ddaaf31b53299017d37b845801c217;hb=8b7354e28b6dc5fbd3fe48bb235bf7003c66f9fd;hp=8e7977bd797c80f6bb31d7f49ea4c3f10d091705;hpb=4a25d9dfd7c17d85e87d4bc645467554fb1adbea;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index 8e7977b..b794e7c 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -1037,7 +1037,7 @@ void s_image(char*name, char*type, char*filename, int quality)
     int imageID = id;
     int width, height;
     if(!strcmp(type,"jpeg")) {
-#ifndef HAVE_LIBJPEG
+#ifndef HAVE_JPEGLIB
 	warning("no jpeg support compiled in");
 	s_box(name, 0, 0, black, 20, 0);
 	return;
@@ -1520,13 +1520,17 @@ void s_includeswf(char*name, char*filename)
 	    level--;
 	if(!level)
 	    break;
-	/* We simply dump all tags right after the sprite
-	   header, relying on the fact that swf_OptimizeTagOrder() will
-	   sort things out for us later. 
-	   We also rely on the fact that the imported SWF is well-formed.
-	 */
-	tag = swf_InsertTag(tag, ftag->id);
-	swf_SetBlock(tag, ftag->data, ftag->len);
+
+	if(ftag->id != ST_SETBACKGROUNDCOLOR) {
+	    /* We simply dump all tags right after the sprite
+	       header, relying on the fact that swf_OptimizeTagOrder() will
+	       sort things out for us later. 
+	       We also rely on the fact that the imported SWF is well-formed.
+	     */
+	    tag = swf_InsertTag(tag, ftag->id);
+	    swf_SetBlock(tag, ftag->data, ftag->len);
+	}
+
 	ftag = ftag->next;
     }
     if(!ftag)