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

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 72d1147..b4dbfb9 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) {
@@ -275,7 +285,7 @@ void args_callback_usage(char *name)
     printf("-f , --frame                   The following identifier is a frame or framelabel, not an id or objectname\n");
     printf("-x , --movex <xpos>            x Adjust position of slave by <xpos> pixels\n");
     printf("-y , --movey <ypos>            y Adjust position of slave by <ypos> pixels\n");
-    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
+    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
     printf("-r , --rate <fps>              Set movie framerate to <fps> (frames/sec)\n");
     printf("-X , --width <width>           Force movie bbox width to <width> (default: use master width (not with -t))\n");
     printf("-Y , --height <height>          Force movie bbox height to <height> (default: use master height (not with -t))\n");
@@ -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);