[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:42:25 CET 2014


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

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

(cherry picked from commit fc45d0b90fb85160d2d1af8302b70fcfe135a59d)

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

 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 fbd7f23..dd0a74a 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -98,8 +98,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