[vlc-commits] contrib/ffmpeg: added support for iOS

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Mar 20 19:53:40 2012 +0100| [da579e28f47862e7752a5073d07c5d754a374271] | committer: Felix Paul Kühne

contrib/ffmpeg: added support for iOS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da579e28f47862e7752a5073d07c5d754a374271
---

 contrib/src/ffmpeg/rules.mak |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2097ff8..34c86ee 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -41,7 +41,10 @@ endif
 #endif
 
 ifdef HAVE_CROSS_COMPILE
-FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
+FFMPEGCONF += --enable-cross-compile
+ifndef HAVE_IOS
+FFMPEGCONF += --cross-prefix=$(HOST)-
+endif
 endif
 
 # ARM stuff
@@ -66,6 +69,9 @@ ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
 endif
+ifdef HAVE_IOS
+FFMPEGCONF += --as="$(TOPSRC)/../extras/tools/gas/gas-preprocessor.pl $(CC)" --enable-pic
+endif
 
 # Linux
 ifdef HAVE_LINUX