bugfixes.

diff --git a/Makefile.common.in b/Makefile.common.in
index 673e63c..f2f10fa 100755 (executable)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -55,6 +55,15 @@ UNINSTALL_BIN = ff=`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/
 INSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "$(INSTALL_DATA) $$ff $(man1dir)/$$inst"; $(INSTALL_DATA) $$ff $(man1dir)/$$inst
 UNINSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "rm -f $(man1dir)/$$inst"; rm -f $(man1dir)/$$inst
 
+#%.o: %.c
+#      $(C) $< -o $@
+
+#%: %.o
+#      $(L) $< -o $@ ../lib/librfxswf.a $(LIBS) 
+
+#%.o: %.cc
+#      $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf $< -o $@
+
 # GNU Makefile stuff
 
 .SUFFIXES:

diff --git a/TODO b/TODO
index c5751fc..e3d76bf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,3 +18,7 @@ swfextract:
     
     * mp3 extraction should also work for movieclips.
     * improve placeobject handling
+
+wav2swf:
+    
+    * -r flag doesn't work without -d option.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0aa620b..754e471 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -27,5 +27,5 @@ uninstall:
 
 clean: 
        rm -f *.o *.lo *.a *.la
-       cd lame;make clean;cd ..
+       cd lame;$(MAKE) clean;cd ..
 

diff --git a/lib/modules/swfaction.c b/lib/modules/swfaction.c
index fdd93d8..b671fff 100644 (file)
--- a/lib/modules/swfaction.c
+++ b/lib/modules/swfaction.c
@@ -625,7 +625,7 @@ void swf_ActionEnd(ActionTAG* atag)
 
 static ActionTAG*lastATAG(ActionTAG*atag)
 {
-    ActionTAG*last;
+    ActionTAG*last = 0;
     while(atag) {
        last = atag;
        atag=atag->next;

diff --git a/src/wav2swf.c b/src/wav2swf.c
index ebd1ad1..45ef407 100644 (file)
--- a/src/wav2swf.c
+++ b/src/wav2swf.c
@@ -113,6 +113,10 @@ int main (int argc,char ** argv)
 
     processargs(argc, argv);
 
+    if(!definesound && framerate) {
+       printf("Warning! The -r option is experimental and won't work without -d\n");
+    }
+
     blocksize = 1152;
     blockspersecond = 11025.0/blocksize;
     framespersecond = blockspersecond;