Commit bf06caea authored by Sébastien Toque's avatar Sébastien Toque

add srt subtitles support

parent 0d17d4fd
...@@ -40,7 +40,7 @@ fi ...@@ -40,7 +40,7 @@ fi
export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH} export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
# 1/ libvlc, libvlccore and its plugins # 1/ libvlc, libvlccore and its plugins
TESTED_HASH=2ac6942827e8 TESTED_HASH=e354bf04a542
if [ ! -d "vlc" ]; then if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning" echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc git clone git://git.videolan.org/vlc.git vlc
...@@ -80,7 +80,6 @@ cd contrib/android ...@@ -80,7 +80,6 @@ cd contrib/android
--disable-SDL_image \ --disable-SDL_image \
--disable-fontconfig \ --disable-fontconfig \
--disable-ass \ --disable-ass \
--disable-freetyp2 \
--disable-fribidi \ --disable-fribidi \
--disable-zvbi \ --disable-zvbi \
--disable-kate \ --disable-kate \
...@@ -92,7 +91,8 @@ cd contrib/android ...@@ -92,7 +91,8 @@ cd contrib/android
--disable-tremor \ --disable-tremor \
--disable-vorbis \ --disable-vorbis \
--disable-sidplay2 \ --disable-sidplay2 \
--disable-samplerate --disable-samplerate \
--enable-iconv
# TODO: mpeg2, theora # TODO: mpeg2, theora
......
...@@ -91,7 +91,6 @@ sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown- ...@@ -91,7 +91,6 @@ sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown-
--disable-skins2 \ --disable-skins2 \
--disable-mtp \ --disable-mtp \
--disable-notify \ --disable-notify \
--disable-freetype \
--disable-libass \ --disable-libass \
--disable-svg \ --disable-svg \
--disable-sqlite \ --disable-sqlite \
......
...@@ -32,7 +32,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \ ...@@ -32,7 +32,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \ -lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \
-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \ -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
-lspeex -lspeexdsp \ -lspeex -lspeexdsp \
-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \ -lxml2 -lpng -lgnutls -lgcrypt -lgpg-error -lfreetype -liconv \
$(CPP_STATIC) $(CPP_STATIC)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment