X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=8981b1d00659174a046911708bceec67bddeff6b;hb=a4418b8eadbf6f186ad1a8f6965efd9db072790f;hp=aae3e51ad35f630a6fe5d00d1a9b625028967ce4;hpb=49d4c54ec9563c28b0cf97add1e8e86a954d3bbc;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index aae3e51..8981b1d 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -1125,6 +1125,11 @@ int main(int argn, char *argv[])
 	msg("<error> Can't combine --cat and --merge");
 	exit(1);
     }
+    
+    if(config.stack && config.cat) {
+	msg("<error> Can't combine --cat and --stack");
+	exit(1);
+    }
 
     if(config.stack) {
 	if(config.overlay) {
@@ -1234,6 +1239,12 @@ int main(int argn, char *argv[])
 	    combine(&master, slave_name[t], &slave, &newswf);
 	    master = newswf;
 	}
+	if(config.dummy && !config.hassizex && !config.hassizey && !config.mastermovex && !config.mastermovey) {
+	    newswf.movieSize.xmin = newswf.movieSize.xmin*config.masterscalex;
+	    newswf.movieSize.ymin = newswf.movieSize.ymin*config.masterscaley;
+	    newswf.movieSize.xmax = newswf.movieSize.xmax*config.masterscalex;
+	    newswf.movieSize.ymax = newswf.movieSize.ymax*config.masterscaley;
+	}
     }
 
     fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);