X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Favi2swf.cc;h=dc9f5fee40329e2c2675720d1296930428ca1eac;hb=c7432833fe3a6469d63fad135151a92e12877b94;hp=c530cbbb3ca29cb32d3b9706f31d7dc556938ede;hpb=1c4649900f64f30c7e7071808df4a7910751b20d;p=swftools.git

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index c530cbb..dc9f5fe 100644
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -26,17 +26,7 @@
 
 #include "../config.h"
 
-#ifdef HAVE_SIGNAL_H
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#include <signal.h>
-#define DO_SIGNALS
-#endif
-#endif
-
-extern "C" {
 #include "../lib/args.h"
-}
 #include "v2swf.h"
 #include "videoreader_avifile.hh"
 
@@ -188,9 +178,6 @@ static char*itoa(int a)
     return toabuf;
 }
 
-static int shutdown_avi2swf = 0;
-static int frameno = 0;
-
 #ifdef DO_SIGNALS
 pthread_t main_thread;
 static void sigterm(int sig)
@@ -269,6 +256,10 @@ int main (int argc,char ** argv)
     v2swf_setparameter(&v2swf, "keyframe_interval", itoa(keyframe_interval));
     if(expensive)
 	v2swf_setparameter(&v2swf, "motioncompensation", "1");
+    if(flip)
+	video.setparameter(&video, "flip", "1");
+    if(verbose)
+	video.setparameter(&video, "verbose", "1");
 
     if(!verbose)
 	printf("\n");
@@ -295,7 +286,7 @@ int main (int argc,char ** argv)
 	    video.getimage(&video, buf);
 	    video.getsamples(&video, buf, (int)((video.rate/video.fps)*video.channels*2));
 	    if(!verbose) {
-		printf("\rSkipping frame %d", frameno);fflush(stdout);
+		printf("\rSkipping frame %d", video.frame);fflush(stdout);
 	    }
 	}
 	free(buf);
@@ -308,7 +299,7 @@ int main (int argc,char ** argv)
 	if(!l)
 	    break;
 	if(!verbose) {
-	    printf("\rConverting frame %d", frameno);fflush(stdout);
+	    printf("\rConverting frame %d", video.frame);fflush(stdout);
 	}
     }
     if(!verbose)