git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated from configure.in
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
d52aa71
..
aae3e51
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-137,7
+137,7
@@
int args_callback_option(char*name,char*val) {
{
float rate = atof(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);
}
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);
exit(1);
}
close(fi);
+ swf_RemoveJPEGTables(&head);
msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
msg("<verbose> 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("<fatal> Failed to read from %s\n", master_filename);
exit(1);
}
msg("<fatal> Failed to read from %s\n", master_filename);
exit(1);
}
+ swf_RemoveJPEGTables(&master);
msg("<debug> Read %d bytes from masterfile\n", ret);
close(fi);
}
msg("<debug> Read %d bytes from masterfile\n", ret);
close(fi);
}
@@
-1218,6
+1220,7
@@
int main(int argn, char *argv[])
}
msg("<debug> Read %d bytes from slavefile\n", ret);
close(fi);
}
msg("<debug> Read %d bytes from slavefile\n", ret);
close(fi);
+ swf_RemoveJPEGTables(&slave);
}
else
{
}
else
{