From bece277132bab24904f98da5d2ebad4a0cfc572c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 17 Jun 2010 12:39:58 +0000
Subject: main/ffmpeg: upgrade to 0.6

with vp8 support
---
 main/ffmpeg/pic.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'main/ffmpeg/pic.patch')

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
-- 
cgit v1.2.3