Commit a6ad4f57 authored by gbazin's avatar gbazin

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

parent b98d05ef
? 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
......@@ -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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment