[vlc-commits] contrib/avcodec: unconditionally enable pic on iOS (close #10532, close #10531)

Felix Paul Kühne git at videolan.org
Wed Feb 5 15:41:33 CET 2014


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Feb  5 15:12:37 2014 +0100| [fc45d0b90fb85160d2d1af8302b70fcfe135a59d] | committer: Felix Paul Kühne

contrib/avcodec: unconditionally enable pic on iOS (close #10532, close #10531)

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

 contrib/src/ffmpeg/rules.mak |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3516b7a..8324226 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -101,8 +101,9 @@ FFMPEGCONF += --cpu=core2
 endif
 endif
 ifdef HAVE_IOS
-ifeq ($(ARCH),arm)
-FFMPEGCONF += --enable-pic --as="$(AS)"
+FFMPEGCONF += --enable-pic
+ifdef HAVE_NEON
+FFMPEGCONF += --as="$(AS)"
 endif
 endif
 ifdef HAVE_MACOSX



More information about the vlc-commits mailing list