X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=b1b0d693d90fcc20c227f1c9c9e839847e84e598;hb=dbb81bd70349ec0dbc8e2ad6af3c3ac93ca868cd;hp=f564793c123dc2d9d747177fc371d9f3f17adb6a;hpb=4ce5fe753017a9c0f7a3621ea57166a3e2c25b8b;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index f564793..b1b0d69 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -1034,6 +1034,9 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     slaveid = -1;
     slaveframe = -1;
 
+    if(!master->fileVersion && slave)
+	master->fileVersion = slave->fileVersion;
+
     swf_FoldAll(master);
     swf_FoldAll(slave);
 
@@ -1235,7 +1238,7 @@ int main(int argn, char *argv[])
 		memset(&slave, 0, sizeof(slave));
 		slave.firstTag = swf_InsertTag(0, ST_END);
 		slave.frameRate = 0;
-		slave.fileVersion = 4;
+		slave.fileVersion = 0;
 		slave.frameCount = 0;
 	    }
 
@@ -1250,6 +1253,9 @@ int main(int argn, char *argv[])
 	}
     }
 
+    if(!newswf.fileVersion)
+	newswf.fileVersion = 4;
+
     fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);
 
     if(config.zlib) {