[vlc-commits] contrib/avcodec: remove remnant

Felix Paul Kühne git at videolan.org
Thu Jan 23 13:21:49 CET 2014


vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Jan 22 13:42:36 2014 +0100| [9e02d1b384c989a9c9a38b6d542645ba96e84a15] | committer: Felix Paul Kühne

contrib/avcodec: remove remnant

(cherry picked from commit ba2d5efe17fd664fb3cd356a09782db31a42ee79)

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

 contrib/src/ffmpeg/rules.mak |    1 -
 1 file changed, 1 deletion(-)

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



More information about the vlc-commits mailing list