fixed bug in jpeg2000 decoding

[swftools.git] / src / swfcombine.c

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 48847c2..9ecc162 100644 (file)
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -128,6 +128,11 @@ int args_callback_option(char*name,char*val) {
        config.isframe = 1;
        return 0;
     }
+    else if (!strcmp(name, "F"))
+    {
+       config.flashversion = atoi(val);
+       return 1;
+    }
     else if (!strcmp(name, "d"))
     {
        config.dummy = 1;
@@ -316,7 +321,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");
@@ -1385,6 +1390,7 @@ int main(int argn, char *argv[])
        swf_WriteSWF(fi, &newswf);
     }
     close(fi);
-    return 0;
+
+    return 0; //ok
 }