Merge tag 'v0.19.6'

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);

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),

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
 	}