diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | android/AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | android/build.py | 12 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 5 | ||||
| -rw-r--r-- | src/output/Init.cxx | 1 | ||||
| -rw-r--r-- | src/thread/Id.hxx | 4 |
7 files changed, 31 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index cf130ad92..ba6d3b30e 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,8 @@ tags /test/test_vorbis_encoder /test/DumpDatabase +/lib/ + /*.tar.gz /*.tar.bz2 /*.tar.xz @@ -12,6 +12,14 @@ ver 0.20 (not yet released) * reset song priority on playback * remove dependency on GLib +ver 0.19.6 (2014/12/08) +* decoder + - ffmpeg: support FFmpeg 2.5 +* fix build failure with musl +* android + - update libFLAC to 1.3.1 + - update FFmpeg to 2.5 + ver 0.19.5 (2014/11/26) * input - nfs: fix crash on connection failure @@ -152,6 +160,11 @@ ver 0.19 (2014/10/10) * install systemd unit for socket activation * Android port +ver 0.18.20 (2014/12/08) +* decoder + - ffmpeg: support FFmpeg 2.5 +* fix build failure with musl + ver 0.18.19 (2014/11/26) * archive - zzip: fix crash after seeking diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 8625bd76e..616536ab7 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.musicpd" android:installLocation="auto" - android:versionCode="9" - android:versionName="0.19.5"> + android:versionCode="10" + android:versionName="0.19.6"> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/> diff --git a/android/build.py b/android/build.py index 020ba7fd1..ef201c5de 100755 --- a/android/build.py +++ b/android/build.py @@ -314,8 +314,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'https://svn.xiph.org/releases/flac/flac-1.3.0.tar.xz', - '13b5c214cee8373464d3d65dee362cdd', + 'http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz', + 'b9922c9a0378c88d3e901b234f852698', 'lib/libFLAC.a', [ '--disable-shared', '--enable-static', @@ -341,8 +341,8 @@ thirdparty_libs = [ ), FfmpegProject( - 'http://www.ffmpeg.org/releases/ffmpeg-2.2.3.tar.bz2', - 'dbb5b6b69bd010916f17df0ae596e0b1', + 'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2', + '4346fe710cc6bdd981f6534d2420d1ab', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', @@ -366,8 +366,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.37.0.tar.lzma', - '54bfd1eb5214f604186d6f5ac61c7781', + 'http://curl.haxx.se/download/curl-7.39.0.tar.lzma', + 'e9aa6dec29920eba8ef706ea5823bad7', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 466caa3d1..e150fa3bf 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -423,10 +423,15 @@ ffmpeg_probe(Decoder *decoder, InputStream &is) avpd.filename = is.GetURI(); #ifdef AVPROBE_SCORE_MIME +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(56, 5, 1) /* this attribute was added in libav/ffmpeg version 11, but unfortunately it's "uint8_t" instead of "char", and it's not "const" - wtf? */ avpd.mime_type = (uint8_t *)const_cast<char *>(is.GetMimeType()); +#else + /* API problem fixed in FFmpeg 2.5 */ + avpd.mime_type = is.GetMimeType(); +#endif #endif return av_probe_input_format(&avpd, true); diff --git a/src/output/Init.cxx b/src/output/Init.cxx index 9418b6414..04fc421f3 100644 --- a/src/output/Init.cxx +++ b/src/output/Init.cxx @@ -48,6 +48,7 @@ AudioOutput::AudioOutput(const AudioOutputPlugin &_plugin) :plugin(_plugin), + mixer(nullptr), enabled(true), really_enabled(false), open(false), pause(false), diff --git a/src/thread/Id.hxx b/src/thread/Id.hxx index 7b10de074..11be0a56b 100644 --- a/src/thread/Id.hxx +++ b/src/thread/Id.hxx @@ -75,7 +75,7 @@ public: #ifdef WIN32 return ::GetCurrentThreadId(); #else - return ::pthread_self(); + return pthread_self(); #endif } @@ -84,7 +84,7 @@ public: #ifdef WIN32 return id == other.id; #else - return ::pthread_equal(id, other.id); + return pthread_equal(id, other.id); #endif } |