X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcombine.c;h=9a033cb7ef8137bbfeac7c78983b4ce63689a67d;hb=481f699009f197fcec789c94996f4d81fef364e0;hp=4847a583e5c3046c55df2b3bbc9d3f09b51cacce;hpb=22a49dfc00af6fc1b43057b44790f2087a09b6f2;p=swftools.git

diff --git a/src/combine.c b/src/combine.c
index 4847a58..9a033cb 100644
--- a/src/combine.c
+++ b/src/combine.c
@@ -84,7 +84,7 @@ void jpeg_assert()
 	pos++;
     }
     pos = 0;
-    while(master.tags[pos].id != 0)
+    while(slave.tags[pos].id != 0)
     {
 	if(slave.tags[pos].id == TAGID_JPEGTABLES)
 	    spos = pos;
@@ -581,7 +581,7 @@ uchar * normalcombine(uchar*masterdata, int masterlength, char*_slavename, uchar
 	int spriteid = -1;
 	int replaceddefine = -1;
 	struct writer_t w;
-	int frame;
+	int frame = 0;
 	char*framelabel;
 	
 	length = masterlength + slavelength*2 + 128; // this is a guess, but a good guess.