* Patches/ffmpeg-cvs.patch: lrintf() detection work-around for win32.

diff --git a/extras/contrib/src/Patches/ffmpeg-20050513-win32.patch b/extras/contrib/src/Patches/ffmpeg-20050513-win32.patch
deleted file mode 100644 (file)
index 4ee4716..0000000
--- a/extras/contrib/src/Patches/ffmpeg-20050513-win32.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-? win-ffmpeg.sh
-Index: libavcodec/libpostproc/postprocess.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/postprocess.c,v
-retrieving revision 1.110
-diff -u -r1.110 postprocess.c
---- libavcodec/libpostproc/postprocess.c       11 May 2005 23:51:44 -0000      1.110
-+++ libavcodec/libpostproc/postprocess.c       13 May 2005 09:22:27 -0000
-@@ -92,6 +92,8 @@
- 
- #include "mangle.h" //FIXME should be supressed
- 
-+#define RUNTIME_CPUDETECT 1
-+
- #ifdef HAVE_ALTIVEC_H
- #include <altivec.h>
- #endif

diff --git a/extras/contrib/src/Patches/ffmpeg-cvs.patch b/extras/contrib/src/Patches/ffmpeg-cvs.patch
index 67a647432b61bbe582f168cd6f2cbea91157936c..c711db08d129a23d7251b301d5d98f36fb37939f 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg-cvs.patch
+++ b/extras/contrib/src/Patches/ffmpeg-cvs.patch
@@ -14,3 +14,19 @@ diff -u -r1.26 Makefile
  ifeq ($(SHARED_PP),yes)
  ifeq ($(CONFIG_WIN32),yes)
        install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
+Index: libavutil/common.h
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
+retrieving revision 1.153
+diff -u -r1.153 common.h
+--- libavutil/common.h 19 Sep 2005 23:26:47 -0000      1.153
++++ libavutil/common.h 1 Nov 2005 21:40:31 -0000
+@@ -543,7 +543,7 @@
+     }\
+ }
+ 
+-#ifndef HAVE_LRINTF
++#if !defined(HAVE_LRINTF) && !defined(__MINGW32__)
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+ /* btw, rintf() is existing on fbsd too -- alex */