diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
| commit | cd39cdcaac4bb080e939cd79288a3fa626528f7f (patch) | |
| tree | 9ff9f55a84f988b8095d02240e74ae91eddd3e24 /main/ffmpeg/pic.patch | |
| parent | 85fd77589be2f6c970ca6895afa1520e0a2fda04 (diff) | |
| parent | bf31029cd1255d11b787a857a103139ddbe2b29d (diff) | |
| download | aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.bz2 aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.xz | |
Merge remote branch 'alpine/master'
Diffstat (limited to 'main/ffmpeg/pic.patch')
| -rw-r--r-- | main/ffmpeg/pic.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch index 9651f31ef1..737e30ddeb 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 |