diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index e2a28409e..b9bc2c26e 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -269,7 +269,7 @@ MultiABI='armeabi-v7a' # arm64-v8a x86 x86_64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma" +CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma mad" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index b0941a22c..71e91831a 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit b0941a22c239b52073ee5c9ee34e730280baa117 +Subproject commit 71e91831a08f3815556384b5c5f58179abc6b649 diff --git a/project/jni/sdl_mixer/music_mad.c b/project/jni/sdl_mixer/music_mad.c index e9dfead33..f4114b346 100644 --- a/project/jni/sdl_mixer/music_mad.c +++ b/project/jni/sdl_mixer/music_mad.c @@ -242,7 +242,7 @@ mad_getSamples(mad_data *mp3_mad, Uint8 *stream, int len) { if ((mp3_mad->status & MS_playing) == 0) { /* We're not supposed to be playing, so send silence instead. */ memset(stream, 0, len); - return; + return 0; } out = stream;