diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:14:29 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:14:29 +0000 |
| commit | 4d4012b533caafdad2f62279a892f6a53e9ba112 (patch) | |
| tree | 8fa6f7a1d9d9ab92cbc482a6bb53ae6c35ec9960 /multimedia/x264/files/patch-common_cpu.c | |
| parent | multimedia/x264: add OPENCL option, enabled by default (diff) | |
multimedia/x264: update to 0.148.2708
Changes: https://git.videolan.org/?p=x264.git;a=shortlog;h=86b71982e131eaa70125f8d0e725fcade9c4c677
Differential Revision: https://reviews.freebsd.org/D7958
Approved by: koobs (maintainer)
Notes
Notes:
svn path=/head/; revision=422672
Diffstat (limited to 'multimedia/x264/files/patch-common_cpu.c')
| -rw-r--r-- | multimedia/x264/files/patch-common_cpu.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/multimedia/x264/files/patch-common_cpu.c b/multimedia/x264/files/patch-common_cpu.c deleted file mode 100644 index 08ddb9e34a07..000000000000 --- a/multimedia/x264/files/patch-common_cpu.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/cpu.c.orig 2015-06-29 20:45:09 UTC -+++ common/cpu.c -@@ -316,7 +316,7 @@ uint32_t x264_cpu_detect( void ) - - #elif ARCH_PPC - --#if SYS_MACOSX || SYS_OPENBSD -+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD - #include <sys/sysctl.h> - uint32_t x264_cpu_detect( void ) - { -@@ -324,12 +324,16 @@ uint32_t x264_cpu_detect( void ) - uint32_t cpu = 0; - #if SYS_OPENBSD - int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; --#else -+#elif SYS_MACOSX - int selectors[2] = { CTL_HW, HW_VECTORUNIT }; - #endif - int has_altivec = 0; - size_t length = sizeof( has_altivec ); -+#if SYS_MACOSX || SYS_OPENBSD - int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 ); -+#else -+ int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 ); -+#endif - - if( error == 0 && has_altivec != 0 ) - cpu |= X264_CPU_ALTIVEC; |