| 123456789101112131415161718192021222324252627282930 |
- From fc45d0b90fb85160d2d1af8302b70fcfe135a59d Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Wed, 5 Feb 2014 15:12:37 +0100
- Subject: [PATCH 01/24] contrib/avcodec: unconditionally enable pic on iOS
- (close #10532, close #10531)
- ---
- 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
- --
- 1.8.3.4 (Apple Git-47)
|
