This patch fix a build error with FFmpeg 2.5.
Upstream commit b15b06ebf582ae81e47d236524c9ad6e10c8a0a7 changes the type of
AVProbeData.mime_type from uint8_t* to const char*. So the 'casting hack' is
not needed anymore.
Signed-off-by: Jörg Krause <jkra...@posteo.de>
---
src/decoder/plugins/FfmpegDecoderPlugin.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 466caa3..f442329 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -423,10 +423,7 @@ ffmpeg_probe(Decoder *decoder, InputStream &is)
avpd.filename = is.GetURI();
#ifdef AVPROBE_SCORE_MIME
- /* 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());
+ avpd.mime_type = const_cast<char *>(is.GetMimeType());
#endif
return av_probe_input_format(&avpd, true);
--
2.1.3
_______________________________________________
mpd-devel mailing list
mpd-devel@musicpd.org
http://mailman.blarg.de/listinfo/mpd-devel
