X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fjpeg2swf.c;h=9981a15f65848e074403ad91742903b3d4c79716;hp=e83d411ad4413a8dbe9599511df2d22dafc2ccee;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=aef51a898cfdddcf22bc008fdf34e4ff5c557486

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index e83d411..9981a15 100644
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -136,13 +136,11 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
 	    sname = "output.swf";
 	handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
     }
-    if(global.version >= 6) {
-	if (swf_WriteSWC(handle, swf)<0) 
-		fprintf(stderr, "Unable to write output file: %s\n", sname);
-    } else {
-	if (swf_WriteSWF(handle, swf)<0) 
-		fprintf(stderr, "Unable to write output file: %s\n", sname);
+    if(handle<0 && sname) {
+        perror(sname);
     }
+    if (swf_WriteSWF(handle, swf)<0) 
+        fprintf(stderr, "Unable to write output file: %s\n", sname);
 
     if (handle != so)
 	close(handle);
@@ -495,6 +493,12 @@ int args_callback_option(char *arg, char *val)
 	    break;
 	}
 
+	case 'M': {
+	    global.mx = 1;
+	    res = 1;
+	    break;
+	}
+
 	case 'm': {
 	    char*s = strdup(val);
 	    char*c = strchr(s, ':');
@@ -537,8 +541,12 @@ static struct options_t options[] = {
 {"q", "quality"},
 {"r", "rate"},
 {"z", "zlib"},
+{"M", "mx"},
+{"x", "xoffset"},
+{"y", "yoffset"},
 {"X", "width"},
 {"Y", "height"},
+{"T", "flashversion"},
 {"v", "verbose"},
 {"V", "version"},
 {"f", "fit-to-movie"},
@@ -579,10 +587,14 @@ void args_callback_usage(char *name)
     printf("\n");
     printf("-o , --output <outputfile>     Explicitly specify output file. (otherwise, output.swf will be used)\n");
     printf("-q , --quality <quality>       Set compression quality (1-100, 1=worst, 100=best)\n");
-    printf("-r , --rate <framerate>         Set movie framerate (frames per second)\n");
+    printf("-r , --rate <framerate>        Set movie framerate (frames per second)\n");
     printf("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\n");
+    printf("-M , --mx                      Use Flash MX H.263 compression (use for correlated images)\n");
+    printf("-x , --xoffset <offset>        horizontally offset images by <offset>\n");
+    printf("-y , --yoffset <offset>        vertically offset images by <offset>\n");
     printf("-X , --width <width>           Force movie width to <width> (default: autodetect)\n");
     printf("-Y , --height <height>         Force movie height to <height> (default: autodetect)\n");
+    printf("-T , --flashversion <version>      Set flash file version to <version>\n");
     printf("-v , --verbose <level>         Set verbose level to <level> (0=quiet, 1=default, 2=debug)\n");
     printf("-V , --version                 Print version information and exit\n");
     printf("-f , --fit-to-movie            Fit images to movie size\n");
@@ -620,7 +632,7 @@ int main(int argc, char **argv)
 	int i;
 	for (i = 0; i < global.nfiles; i++) {
 	    if (VERBOSE(3))
-		fprintf(stderr, "[%03i] %s (%i%%, 1/%i)\n", i,
+		fprintf(stderr, "[%03i] %s (%i%%)\n", i,
 			image[i].filename, image[i].quality);
 	    t = MovieAddFrame(&swf, t, image[i].filename, image[i].quality,
 			      image[i].width, image[i].height);