X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfextract.c;h=aca4d970bc62f95fad7e630c33b8faf4999affc2;hb=92013ccec1cef810347d61538e376d53d4a444f3;hp=37724559bf786acea7e3ff29eec49f863a040303;hpb=d8c3da8ef4f7a7a504f682f1a1a973bcf7bf0cfb;p=swftools.git

diff --git a/src/swfextract.c b/src/swfextract.c
index 3772455..aca4d97 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -562,7 +562,7 @@ void handlejpeg(TAG*tag)
     /* swf jpeg images have two streams, which both start with ff d8 and
        end with ff d9. The following code handles sorting the middle
        <ff d9 ff d8> bytes out, so that one stream remains */
-    if(tag->id == ST_DEFINEBITS && tag->len>2 && jpegtables) {
+    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && jpegtables) {
 	fi = save_fopen(filename, "wb");
 	fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
 	fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
@@ -571,13 +571,17 @@ void handlejpeg(TAG*tag)
     else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
 	int end = tag->len;
 	int pos = findjpegboundary(&tag->data[2], tag->len-2);
-	if(pos<0)
-	    return;
-	pos+=2;
-	fi = save_fopen(filename, "wb");
-	fwrite(&tag->data[2], pos-2, 1, fi);
-	fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
-	fclose(fi);
+	if(pos>=0) {
+            pos+=2;
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[2], pos-2, 1, fi);
+            fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
+            fclose(fi);
+        } else {
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[2], end-2, 1, fi);
+            fclose(fi);
+        }
     }
     else if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
 	U32 end = GET32(&tag->data[2])+6;
@@ -893,6 +897,8 @@ void handledefinesound(TAG*tag)
     
     samples = swf_GetU32(tag);
 
+    extension = "raw";
+
     if(format == 2) { // mp3
 	swf_GetU16(tag); //numsamples_seek
 	extension = "mp3";