Skip to content

V
vlc-1.1
Commit 8c5cc77b authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* extras/contrib/src/Patches/x264.patch: removed the exp2f/sqrtf part of 

    this patch, I committed it upstream instead.
parent 0766ddd7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 15 deletions
extras/contrib/src/Patches/x264.patch
View file @ 8c5cc77b
......@@ -32,18 +32,3 @@ diff -ruN x264.orig/Makefile x264/Makefile
etags: TAGS
diff -ruN x264.orig/encoder/ratecontrol.c x264/encoder/ratecontrol.c
--- x264.orig/encoder/ratecontrol.c Sun Jun 5 13:07:28 2005
+++ x264/encoder/ratecontrol.c Sun Jun 26 03:09:52 2005
@@ -37,8 +37,9 @@
#include "common/macroblock.h"
#include "ratecontrol.h"
-#if defined(SYS_FREEBSD) || defined(SYS_BEOS)
-#define exp2f(x) powf( 2, (x) )
+#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_MACOSX)
+#define exp2f(x) (float)pow( 2, (x) )
+#define sqrtf sqrt
#endif
#ifdef _MSC_VER
#define exp2f(x) pow( 2, (x) )
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