diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-08 15:22:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-08 15:22:44 +0100 |
| commit | de43bddc1a5c1b66175265428fc84c5c13e4200c (patch) | |
| tree | 0a2a6f2ff8883a03130fe6c89885885f159fce90 /src | |
| parent | 6edfc56c9df7b212c65a5a40e9d0f132429578ea (diff) | |
| parent | c46f48abec9b55f322070bb3c6e625abb3308dc9 (diff) | |
| download | mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.tar.gz mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.tar.xz mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.zip | |
Merge tag 'v0.19.6'
Diffstat (limited to 'src')
| -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 |
3 files changed, 8 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/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 } |