[Android] Enable Opus

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Thu Sep  6 18:03:48 2012 +0200| [c303bdd0fdd22eba329e3c501c77a438c16f931a] | committer: Rafaël Carré

Enable Opus

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c303bdd0fdd22eba329e3c501c77a438c16f931a
---

 compile.sh                                  |    2 +-
 vlc-android/jni/Android.mk                  |    2 +-
 vlc-android/src/org/videolan/vlc/Media.java |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compile.sh b/compile.sh
index 6c12172..a0b54c8 100755
--- a/compile.sh
+++ b/compile.sh
@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
 export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=df4da38
+TESTED_HASH=11f08a58d0f
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index 24b7d48..6d55952 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -65,7 +65,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
 	-lspeex -lspeexdsp \
 	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \
-	-lfreetype -liconv -lass -lfribidi \
+	-lfreetype -liconv -lass -lfribidi -lopus \
 	$(CPP_STATIC)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/vlc-android/src/org/videolan/vlc/Media.java b/vlc-android/src/org/videolan/vlc/Media.java
index 509fb39..1d515a6 100644
--- a/vlc-android/src/org/videolan/vlc/Media.java
+++ b/vlc-android/src/org/videolan/vlc/Media.java
@@ -46,8 +46,8 @@ public class Media implements Comparable<Media> {
         String[] audio_extensions = {
                 ".a52", ".aac", ".ac3", ".adt", ".adts", ".aif", ".aifc", ".aiff", ".amr", ".aob", ".ape",
                 ".awb", ".cda", ".dts", ".flac", ".it", ".m4a", ".m4p", ".mid", ".mka", ".mlp", ".mod",
-                ".mp1", ".mp2", ".mp3", ".mpc", ".oga", ".ogg", ".oma", ".rmi", ".s3m", ".spx", ".tta",
-                ".voc", ".vqf", ".w64", ".wav", ".wma", ".wv", ".xa", ".xm" };
+                ".mp1", ".mp2", ".mp3", ".mpc", ".oga", ".ogg", ".oma", ".opus", ".rmi", ".s3m", ".spx",
+                ".tta", ".voc", ".vqf", ".w64", ".wav", ".wma", ".wv", ".xa", ".xm" };
 
         String[] folder_blacklist = {
                 "/alarms",