X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=c1bee8524d6953835a9810ba9c1e908e1b6ab8ed;hb=953eb1108bc95c35a1287bf0ad231807a06f58c5;hp=188bacd2301be7c545706355700c911dd979cbc3;hpb=66919a9db58644b12a7b580cb110e9988f997eec;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 188bacd..c1bee85 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -168,6 +168,10 @@ int png_read_header(FILE*fi, struct png_header*header)
 
 	    if(b!=0 && b!=2 && b!=3 && b!=6) {
 		fprintf(stderr, "Image mode %d not supported!\n", b);
+		if(b == 4) {
+		    fprintf(stderr, "(This is a grayscale image with alpha channel-\n");
+		    fprintf(stderr, " try converting it into an RGB image with alpha channel)\n");
+		}
 		exit(1);
 	    }
 	    if(a!=8 && (b==2 || b==6)) {
@@ -556,7 +560,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    }
 	    if(header.mode==6)
 		applyfilter4(mode, src, old, dest, header.width);
-	    else
+	    else if(header.mode==2)
 		applyfilter3(mode, src, old, dest, header.width);
 	}
 
@@ -591,8 +595,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
 	}
 	free(data2);
-    }
-    else if(header.mode == 0 || header.mode == 3) {
+    } else if(header.mode == 0 || header.mode == 3) {
 	RGBA*rgba;
 	int swf_width = BYTES_PER_SCANLINE(header.width);
 	U8*data2 = malloc(swf_width*header.height);
@@ -817,12 +820,14 @@ int args_callback_option(char *arg, char *val)
 
 struct options_t options[] = 
 { 
+{"h", "help"},
 {"o", "output"},
 {"r", "rate"},
 {"v", "verbose"},
 {"X", "width"},
 {"Y", "height"},
 {"V", "version"},
+{0,0}
 };
 
 int args_callback_longoption(char *name, char *val)