d6adc7cdfe3fee65f8bdba859e19d4e9 avifile-0.6-20010402.tar.gz

Changed files:
    avifile-ac3.patch -> 1.2
    avifile-deplib.patch -> 1.3
    avifile-fps.patch -> 1.1

diff --git a/avifile-ac3.patch b/avifile-ac3.patch
index b1f7a5d88d63c8274a29a4a7b2fd42e170b508b6..ac11571f4326867fd7713421ed76d7b3f24d140c 100644 (file)
--- a/avifile-ac3.patch
+++ b/avifile-ac3.patch
@@ -1,18 +1,18 @@
-diff -urN avifile-0.6.0.org/configure.in avifile-0.6.0/configure.in
---- avifile-0.6.0.org/configure.in     Fri Jan 26 16:57:14 2001
-+++ avifile-0.6.0/configure.in Wed Mar 14 19:22:15 2001
-@@ -242,7 +242,7 @@
-  AC3_CFLAGS=-I$withval;
-  AC3_LDADD=-L$withval/libac3;
-  AC3_LIBS=-lac3;
-- AC3_LIBADD=ac3.o;
-+ AC3_LIBADD=;
+diff -urN avifile-0.6.org/configure.in avifile-0.6/configure.in
+--- avifile-0.6.org/configure.in       Mon Apr  2 15:57:50 2001
++++ avifile-0.6/configure.in   Mon Apr  2 15:58:07 2001
+@@ -372,7 +372,7 @@
+  AC3_CFLAGS=-I$withval
+  AC3_LDADD=-L$withval/libac3
+  AC3_LIBS=-lac3
+- AC3_LIBADD=ac3.o
++ AC3_LIBADD=
   HAVE_AC3=1)
  dnl AC_SUBST(HAVE_AC3)
  AC_SUBST(AC3_PATH)
-diff -urN avifile-0.6.0.org/plugins/libaudiodec/ac3.h avifile-0.6.0/plugins/libaudiodec/ac3.h
---- avifile-0.6.0.org/plugins/libaudiodec/ac3.h        Tue Jan 23 06:14:59 2001
-+++ avifile-0.6.0/plugins/libaudiodec/ac3.h    Wed Mar 14 19:22:38 2001
+diff -urN avifile-0.6.org/plugins/libaudiodec/ac3.h avifile-0.6/plugins/libaudiodec/ac3.h
+--- avifile-0.6.org/plugins/libaudiodec/ac3.h  Mon Apr  2 15:57:50 2001
++++ avifile-0.6/plugins/libaudiodec/ac3.h      Mon Apr  2 15:57:57 2001
 @@ -1,6 +1,6 @@
  #include <audiodecoder.h>
  extern "C" {

diff --git a/avifile-deplib.patch b/avifile-deplib.patch
index a2038842bd9f39af0a1b70bdd18af451a30f97db..c93faf0dfcbc0457986bbfed5104daccebb36420 100644 (file)
--- a/avifile-deplib.patch
+++ b/avifile-deplib.patch
@@ -1,6 +1,6 @@
 diff -urN avifile-0.6.org/Makefile.am avifile-0.6/Makefile.am
---- avifile-0.6.org/Makefile.am        Fri Mar 23 17:27:09 2001
-+++ avifile-0.6/Makefile.am    Fri Mar 23 17:27:53 2001
+--- avifile-0.6.org/Makefile.am        Mon Apr  2 15:55:27 2001
++++ avifile-0.6/Makefile.am    Mon Apr  2 15:55:35 2001
 @@ -1,4 +1,4 @@
 -BASE_SUBDIRS = include plugins lib bin doc
 +BASE_SUBDIRS = include lib plugins bin doc
@@ -8,8 +8,8 @@ diff -urN avifile-0.6.org/Makefile.am avifile-0.6/Makefile.am
  if AM_USE_QT
  QT_SUBDIRS = player samples
 diff -urN avifile-0.6.org/plugins/libaudiodec/Makefile.am avifile-0.6/plugins/libaudiodec/Makefile.am
---- avifile-0.6.org/plugins/libaudiodec/Makefile.am    Fri Mar 23 17:27:10 2001
-+++ avifile-0.6/plugins/libaudiodec/Makefile.am        Fri Mar 23 17:27:20 2001
+--- avifile-0.6.org/plugins/libaudiodec/Makefile.am    Mon Apr  2 15:55:27 2001
++++ avifile-0.6/plugins/libaudiodec/Makefile.am        Mon Apr  2 15:55:35 2001
 @@ -7,4 +7,4 @@
  libaudiodec_la_LDFLAGS = @AC3_LIBS@ @AC3_LDADD@ -module
  CXXFLAGS = @CXXFLAGS@ @AC3_CFLAGS@
@@ -17,8 +17,8 @@ diff -urN avifile-0.6.org/plugins/libaudiodec/Makefile.am avifile-0.6/plugins/li
 -LIBS=
 +LIBS=-L../../lib/.libs -laviplay -lstdc++
 diff -urN avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am
---- avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am    Fri Mar 23 17:27:10 2001
-+++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Fri Mar 23 17:27:20 2001
+--- avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am    Mon Apr  2 15:55:27 2001
++++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Mon Apr  2 15:55:35 2001
 @@ -4,4 +4,4 @@
  libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp mp3encoder.h fillplugins.h
  libmp3lame_audioenc_la_LDFLAGS = -module
@@ -26,18 +26,19 @@ diff -urN avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6/pl
 -LIBS=
 +LIBS=-L../../lib/.libs -laviplay -lstdc++
 diff -urN avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am avifile-0.6/plugins/libmpeg_audiodec/Makefile.am
---- avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am       Fri Mar 23 17:27:10 2001
-+++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Fri Mar 23 17:27:20 2001
-@@ -9,4 +9,4 @@
+--- avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am       Mon Apr  2 15:55:27 2001
++++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Mon Apr  2 15:56:01 2001
+@@ -8,4 +8,5 @@
+ # currently it has to be compiled with optimalizations (inline has to work)
+ CXXFLAGS = @CXXFLAGS@ -O2
  
- CPPFLAGS = @CPPFLAGS@
- 
--LIBS=
-+LIBS=-L../../lib/.libs -laviplay -lstdc++
+-LIBS =
++LIBS = -L../../lib/.libs -laviplay -lstdc++
++
 diff -urN avifile-0.6.org/plugins/libwin32/Makefile.am avifile-0.6/plugins/libwin32/Makefile.am
---- avifile-0.6.org/plugins/libwin32/Makefile.am       Fri Mar 23 17:27:10 2001
-+++ avifile-0.6/plugins/libwin32/Makefile.am   Fri Mar 23 17:28:27 2001
-@@ -13,4 +13,4 @@
+--- avifile-0.6.org/plugins/libwin32/Makefile.am       Mon Apr  2 15:55:28 2001
++++ avifile-0.6/plugins/libwin32/Makefile.am   Mon Apr  2 15:55:35 2001
+@@ -14,4 +14,4 @@
  
  CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
  

diff --git a/avifile-fps.patch b/avifile-fps.patch
new file mode 100644 (file)
index 0000000..2c4248f
--- /dev/null
+++ b/avifile-fps.patch
@@ -0,0 +1,12 @@
+diff -urN avifile-0.6.org/lib/aviplay/aviplay_impl.h avifile-0.6/lib/aviplay/aviplay_impl.h
+--- avifile-0.6.org/lib/aviplay/aviplay_impl.h Mon Apr  2 15:53:38 2001
++++ avifile-0.6/lib/aviplay/aviplay_impl.h     Mon Apr  2 15:54:03 2001
+@@ -231,7 +231,7 @@
+     }
+     int Fps() const
+     {
+-      return (m_pVideostream) ? (int)(1./m_pVideostream->GetFrameTime()) : 0;
++      return (m_pVideostream) ? (int)((1.0/m_pVideostream->GetFrameTime())+0.5) : 0;
+     }
+     virtual const char* FileName()
+     {