aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-08 15:03:09 +0100
committerMax Kellermann <max@duempel.org>2014-12-08 15:03:09 +0100
commitcbc1a58e937f36b6fd9381067132f6dfec99895c (patch)
tree1c09f34d1524026451327d98e2d64929a87090c8
parent811af02f56a829fb2177d25b7eb4f93212a4ea9e (diff)
parent1b5f33a4358f69d153a4c2d2fae34165dc200cca (diff)
downloadmpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.tar.gz
mpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.tar.xz
mpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.zip
Merge tag 'v0.18.20' into v0.19.x
Diffstat (limited to '')
-rw-r--r--NEWS8
-rw-r--r--src/decoder/plugins/FfmpegDecoderPlugin.cxx5
-rw-r--r--src/thread/Id.hxx4
3 files changed, 15 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d79897bae..b52e6e5d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
ver 0.19.6 (not yet released)
+* decoder
+ - ffmpeg: support FFmpeg 2.5
+* fix build failure with musl
* android
- update libFLAC to 1.3.1
@@ -142,6 +145,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/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/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
}