git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for negative coordinates.
[swftools.git]
/
avi2swf
/
avi2swf.cc
diff --git
a/avi2swf/avi2swf.cc
b/avi2swf/avi2swf.cc
index
84fad76
..
bd7d857
100644
(file)
--- a/
avi2swf/avi2swf.cc
+++ b/
avi2swf/avi2swf.cc
@@
-13,6
+13,7
@@
extern "C" {
#include "../lib/rfxswf.h"
#include "../lib/args.h"
}
#include "../lib/rfxswf.h"
#include "../lib/args.h"
}
+#undef HAVE_CONFIG_H
#include <avifile/version.h>
#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6)
#include <avifile.h>
#include <avifile/version.h>
#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6)
#include <avifile.h>
@@
-72,6
+73,7
@@
struct options_t options[] =
{"n","num"},
{"p","flip"},
{"s","start"},
{"n","num"},
{"p","flip"},
{"s","start"},
+ {"d","scale"},
{"z","zlib"},
{"V","version"},
{0,0}
{"z","zlib"},
{"V","version"},
{0,0}
@@
-312,7
+314,7
@@
class GfxBlockCache {
}
best = bestsum/block->len;
}
best = bestsum/block->len;
- if(best > 96.0) {
+ if(best > 64.0) {
misses++;
return -1;
}
misses++;
return -1;
}
@@
-717,9
+719,9
@@
int main (int argc,char ** argv)
int c=0;
if(first) { //first run
tag = swf_InsertTag(NULL, ST_SOUNDSTREAMBLOCK);
int c=0;
if(first) { //first run
tag = swf_InsertTag(NULL, ST_SOUNDSTREAMBLOCK);
- swf_SetSoundStreamBlock(tag, samples, 1);
+ swf_SetSoundStreamBlock(tag, samples, 0, 1);
} else {
} else {
- swf_SetSoundStreamBlock(tag, samples, 0);
+ swf_SetSoundStreamBlock(tag, samples, 0, 0);
}
mp3_sound_pos += mp3_block_size;
}
mp3_sound_pos += mp3_block_size;