X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=aae3e51ad35f630a6fe5d00d1a9b625028967ce4;hb=219fa13e2a8d3118b26156ef68128dd6c0dd43fd;hp=d52aa71102cab87c29f55c4342294e963fb02552;hpb=ff002abfd1088ec03160db56d48bfa58b86db38b;p=swftools.git diff --git a/src/swfcombine.c b/src/swfcombine.c index d52aa71..aae3e51 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -137,7 +137,7 @@ int args_callback_option(char*name,char*val) { { float rate = atof(val); - if ((rate < 1.0/256) ||(rate >= 256.0)) { + if ((rate < 0) ||(rate >= 256.0)) { fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n"); exit(1); } @@ -306,6 +306,7 @@ static void makestackmaster(SWF*swf) exit(1); } close(fi); + swf_RemoveJPEGTables(&head); msg(" File %s has bounding box %d:%d:%d:%d\n", slave_filename[t], head.movieSize.xmin, head.movieSize.ymin, @@ -1151,6 +1152,7 @@ int main(int argn, char *argv[]) msg(" Failed to read from %s\n", master_filename); exit(1); } + swf_RemoveJPEGTables(&master); msg(" Read %d bytes from masterfile\n", ret); close(fi); } @@ -1218,6 +1220,7 @@ int main(int argn, char *argv[]) } msg(" Read %d bytes from slavefile\n", ret); close(fi); + swf_RemoveJPEGTables(&slave); } else {