Disable gpl/ac3/dts

svenhenrik · May 30, 2016 · 39bfc57 · 39bfc57
1 parent 9611423
commit 39bfc57
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
@@ -96,6 +96,8 @@ VLC_BOOTSTRAP_ARGS="\
     --enable-libarchive \
     --disable-libmpeg2 \
     --enable-soxr \
+    --disable-a52 \
+    --disable-gpl \
 "
 
 ###########################
@@ -132,7 +134,7 @@ VLC_CONFIGURE_ARGS="\
     --disable-sid \
     --disable-gme \
     --disable-tremor \
-    --enable-mad \
+    --disable-mad \
     --disable-dca \
     --disable-sdl-image \
     --enable-zvbi \
@@ -163,6 +165,8 @@ VLC_CONFIGURE_ARGS="\
     --disable-faad \
     --disable-x264 \
     --disable-schroedinger \
+    --disable-a52 \
+    --disable-gpl \
 "
 
 ########################

diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
@@ -70,8 +70,8 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-ldl -lz -lm -llog \
 	-ldvbpsi -lmatroska -lebml -ltag \
 	-logg -lFLAC -ltheora -lvorbis \
-	-la52 -lsoxr \
-	-lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \
+	-lsoxr \
+	-lavformat -lavcodec -lswscale -lavutil -lgsm -lopenjpeg \
 	-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
 	-lspeex -lspeexdsp \
 	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \
@@ -80,7 +80,6 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lEGL -lGLESv2 -ljpeg \
 	-ldvdnav -ldvdread -ldvdcss \
 	-ldsm -ltasn1 \
-	-lmad \
 	-lzvbi \
 	-lssh2 \
 	-lmodplug \