summaryrefslogtreecommitdiffstats
path: root/main/ffmpeg/pic.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-17 12:39:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-17 12:43:40 +0000
commitbece277132bab24904f98da5d2ebad4a0cfc572c (patch)
treeb216f3568d29d4c7a041cc0c1ef132266e5c3124 /main/ffmpeg/pic.patch
parent5e9ec9194376d0f0d2b440d23a8b86cd9d17652e (diff)
downloadaports-bece277132bab24904f98da5d2ebad4a0cfc572c.tar.bz2
aports-bece277132bab24904f98da5d2ebad4a0cfc572c.tar.xz
main/ffmpeg: upgrade to 0.6
with vp8 support
Diffstat (limited to 'main/ffmpeg/pic.patch')
-rw-r--r--main/ffmpeg/pic.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch
index 9651f31ef..737e30dde 100644
--- a/main/ffmpeg/pic.patch
+++ b/main/ffmpeg/pic.patch
@@ -1,11 +1,11 @@
---- a/libswscale/rgb2rgb.c 2009-07-10 14:27:39.000000000 +0000
-+++ b/libswscale/rgb2rgb.c 2009-07-10 14:53:45.000000000 +0000
-@@ -149,7 +149,7 @@
+--- ./libswscale/rgb2rgb.c.orig
++++ ./libswscale/rgb2rgb.c
+@@ -159,7 +159,7 @@
#define RENAME(a) a ## _C
#include "rgb2rgb_template.c"
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(PIC)
+-#if ARCH_X86
++#if ARCH_X86 && !defined(PIC)
//MMX versions
#undef RENAME