added -L,-N options

[swftools.git] / src / swfdump.c

diff --git a/src/swfdump.c b/src/swfdump.c
index 6c944b6..2967d91 100644 (file)
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -73,8 +73,8 @@ static struct options_t options[] = {
 {"s", "shapes"},
 {"F", "fonts"},
 {"p", "placements"},
-{"b", "bbox"},
 {"B", "buttons"},
+{"b", "bbox"},
 {"X", "width"},
 {"Y", "height"},
 {"r", "rate"},
@@ -185,6 +185,7 @@ void args_callback_usage(char *name)
     printf("-s , --shapes                  Show shape coordinates/styles\n");
     printf("-F , --fonts                   Show font information\n");
     printf("-p , --placements              Show placement information\n");
+    printf("-B , --buttons                 Show button information\n");
     printf("-b , --bbox                    Print tag's bounding boxes\n");
     printf("-X , --width                   Prints out a string of the form \"-X width\".\n");
     printf("-Y , --height                  Prints out a string of the form \"-Y height\".\n");
@@ -1046,7 +1047,7 @@ int main (int argc,char ** argv)
     if(html)
     {
        char*fileversions[] = {"","1,0,0,0", "2,0,0,0","3,0,0,0","4,0,0,0",
-                              "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0","10,0,0,0"};
+                              "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0","10,0,0,0", "11,0,0,0", "12,0,0,0"};
        if(swf.fileVersion>10) {
            fprintf(stderr, "Fileversion>10\n");
            exit(1);
@@ -1071,9 +1072,11 @@ int main (int argc,char ** argv)
                   "  <PARAM NAME=\"PLAY\" VALUE=\"true\">\n" 
                   "  <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
                   "  <PARAM NAME=\"QUALITY\" VALUE=\"high\">\n"
+                  "  <PARAM NAME=\"ALLOWSCRIPTACCESS\" VALUE=\"always\">\n"
                   "  <EMBED SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\"\n" //bgcolor=#ffffff?
                   "   PLAY=\"true\" ALIGN=\"\" LOOP=\"true\" QUALITY=\"high\"\n"
                   "   TYPE=\"application/x-shockwave-flash\"\n"
+                   "   ALLOWSCRIPTACCESS=\"always\"\n"
                   "   PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n"
                   "  </EMBED>\n" 
                   "</OBJECT>\n", xsize, ysize, fileversions[swf.fileVersion], 
@@ -1198,7 +1201,7 @@ int main (int argc,char ** argv)
             swf_SetTagPos(tag, 0);
             U32 flags = swf_GetU32(tag);
             char*s = swf_GetString(tag);
-            if(flags) {
+            if(flags&~1) {
                 printf(" flags=%08x", flags);
             }
             if(*s) {