[vlc-commits] contrib/avcodec: fix compilation for iOS on ARM

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Dec 31 13:51:46 2013 +0100| [efd255c876bad165b0172769abdfc4f6fc9803a1] | committer: Felix Paul Kühne

contrib/avcodec: fix compilation for iOS on ARM

(cherry picked from commit 1be757bbae5190aa20d782ebdf8066f50ab71338)

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

 contrib/src/ffmpeg/rules.mak |    1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index e2263e0..d908ca3 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -98,6 +98,7 @@ endif
 ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --enable-pic --as="$(AS)"
+FFMPEGCONF += --extra-cflags='-no-integrated-as'
 endif
 endif
 ifdef HAVE_MACOSX