Use mpg123 on Android

compile-libvlc.sh

@@ -91,7 +91,7 @@ VLC_BOOTSTRAP_ARGS="\
     --enable-iconv \
     --disable-aribb24 \
     --disable-aribb25 \
-    --disable-mpg123 \
+    --enable-mpg123 \
     --enable-libdsm \
     --enable-libarchive \
     --disable-libmpeg2 \

compile.sh

@@ -131,7 +131,7 @@ fi
 # Fetch VLC source #
 ####################
 
-TESTED_HASH=7740747
+TESTED_HASH=2f19e4f
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc

libvlc/jni/Android.mk

@@ -86,6 +86,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lmodplug \
 	-lupnp -lthreadutil -lixml \
 	-larchive \
+	-lmpg123 \
 	$(EXTRA_LDFLAGS)
 
 $(TARGET_OUT)/$(LOCAL_MODULE).so: $(ANDROID_PRIVATE_LIBS)