X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=cecffe1a58bd0115f9cd850a04df01b2b49f5b44;hb=cd42ba4fb3c656affa3caecdf91c622860f18fd1;hp=72d1147b64ef2272c34656fe0a5dd5d9302d58b9;hpb=fba07f954ee57839bb73c6481d4dbc52c4afcc5a;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 72d1147..cecffe1 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -161,6 +161,16 @@ int args_callback_option(char*name,char*val) {
 	config.scalex = config.scaley = atoi(val)/100.0;
 	return 1;
     }
+    else if (!strcmp(name, "w"))
+    {
+	config.scalex = atoi(val)/100.0;
+	return 1;
+    }
+    else if (!strcmp(name, "h"))
+    {
+	config.scaley = atoi(val)/100.0;
+	return 1;
+    }
     else if (!strcmp(name, "t") || !strcmp(name, "T"))
     {
 	if(master_filename) {
@@ -1273,9 +1283,10 @@ int main(int argn, char *argv[])
     if(config.zlib) {
 	if(newswf.fileVersion < 6)
 	    newswf.fileVersion = 6;
-	swf_WriteSWC(fi, &newswf);
+        newswf.compressed = 1;
+	swf_WriteSWF(fi, &newswf);
     } else {
-	newswf.compressed = 0;
+	newswf.compressed = -1; // don't compress
 	swf_WriteSWF(fi, &newswf);
     }
     close(fi);