[Android] build: disable libmpeg2
Thomas Guillem
git at videolan.org
Mon Oct 5 13:13:19 CEST 2015
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Oct 5 13:13:11 2015 +0200| [03f9aa8139a169fa20669af5e621325e43df27d9] | committer: Thomas Guillem
build: disable libmpeg2
It fixes text relocation warning (avcodec was and is still used for mpeg2).
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=03f9aa8139a169fa20669af5e621325e43df27d9
---
compile-libvlc.sh | 1 +
libvlc/jni/Android.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 83adbaf..51e1bad 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -94,6 +94,7 @@ VLC_BOOTSTRAP_ARGS="\
--disable-mpg123 \
--enable-libdsm \
--enable-libarchive \
+ --disable-libmpeg2 \
"
###########################
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index eb3df57..a3db0b9 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -70,7 +70,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-ldl -lz -lm -llog \
-ldvbpsi -lmatroska -lebml -ltag \
-logg -lFLAC -ltheora -lvorbis \
- -lmpeg2 -la52 \
+ -la52 \
-lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \
-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
-lspeex -lspeexdsp \
More information about the Android
mailing list