]> git.sesse.net Git - vlc/commitdiff
* extras/contrib/src/Patches/x264.patch: removed the exp2f/sqrtf part of
authorSam Hocevar <sam@videolan.org>
Thu, 16 Feb 2006 22:01:39 +0000 (22:01 +0000)
committerSam Hocevar <sam@videolan.org>
Thu, 16 Feb 2006 22:01:39 +0000 (22:01 +0000)
    this patch, I committed it upstream instead.

extras/contrib/src/Patches/x264.patch

index 53e41f3de22386bb6a6c2bcb671bbee8e9c692bc..6728c8e1594c857ce6282b53162bd8fee2aa68db 100644 (file)
@@ -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) )