X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Favi2swf.cc;h=bd7d8572a42c09e332f127ae3c38fb584fe30ede;hb=735edd1d444cb6c62c655b96b2d37c2da8bda5dd;hp=2f187d5feced7708673d145782b44d7361c09cc7;hpb=ba49b250434b4846d49f35ef1fafb6fc0ba9eeae;p=swftools.git

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index 2f187d5..bd7d857 100644
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -13,6 +13,7 @@ extern "C" {
 #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>
@@ -72,6 +73,7 @@ struct options_t options[] =
  {"n","num"},
  {"p","flip"},
  {"s","start"},
+ {"d","scale"},
  {"z","zlib"},
  {"V","version"},
  {0,0}
@@ -126,7 +128,7 @@ void args_callback_usage(char*name)
     printf("\t-n , --num frames\t Number of frames to encode\n");
     printf("\t-s , --start frame\t First frame to encode\n");
     printf("\t-d , --scale factor\t Scale to factor percent\n");
-    printf("\t-f , --flip\t\t Turn movie upside down\n");
+    printf("\t-p , --flip\t\t Turn movie upside down\n");
     printf("\t-V , --version\t\t Print program version and exit\n");
     exit(0);
 }
@@ -312,7 +314,7 @@ class GfxBlockCache {
 	}
 	best = bestsum/block->len;
 
-	if(best > 96.0) {
+	if(best > 64.0) {
 	    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);
-	      swf_SetSoundStreamBlock(tag, samples, 1);
+	      swf_SetSoundStreamBlock(tag, samples, 0, 1);
 	} else {
-	      swf_SetSoundStreamBlock(tag, samples, 0);
+	      swf_SetSoundStreamBlock(tag, samples, 0, 0);
 	}
 	
 	mp3_sound_pos += mp3_block_size;