X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fswfcombine.c;h=5f8622174a20c6992f8df616f8d0147fc2775b70;hb=f7e02fdcc5f94e3129124abb157037d7b54553e9;hp=f6257fe646744f9a315d54876d9eff253273fce6;hpb=1d20e19dd602b0af21ead7493ef254410fc3a8fe;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index f6257fe..5f86221 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -957,7 +957,8 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     }
 
     swf_Relocate (slave, masterbitmap);
-    swf_RelocateDepth (slave, depthbitmap);
+    if(config.merge)
+	swf_RelocateDepth (slave, depthbitmap);
     jpeg_assert(slave, master);
     
     if (config.overlay)