diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-08 15:03:09 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-08 15:03:09 +0100 |
| commit | cbc1a58e937f36b6fd9381067132f6dfec99895c (patch) | |
| tree | 1c09f34d1524026451327d98e2d64929a87090c8 /src | |
| parent | 811af02f56a829fb2177d25b7eb4f93212a4ea9e (diff) | |
| parent | 1b5f33a4358f69d153a4c2d2fae34165dc200cca (diff) | |
| download | mpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.tar.gz mpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.tar.xz mpd-cbc1a58e937f36b6fd9381067132f6dfec99895c.zip | |
Merge tag 'v0.18.20' into v0.19.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 5 | ||||
| -rw-r--r-- | src/thread/Id.hxx | 4 |
2 files changed, 7 insertions, 2 deletions
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 } |