decoder/ffmpeg: support FFmpeg 2.5

Version 2.5 fixed an API oddity, however it broke API compatibility, at least with C++. Disable the workaround when a libavformat version is detected that is recent enough.

decoder/ffmpeg: support FFmpeg 2.5
41b4a63f · Max Kellermann · d8fc2db9 · 41b4a63f · 41b4a63f
Commit 41b4a63f authored Dec 08, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

NEWS NEWS +2 -0

FfmpegDecoderPlugin.cxx src/decoder/FfmpegDecoderPlugin.cxx +5 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.20 (not yet released)
+* decoder
+  - ffmpeg: support FFmpeg 2.5
 * fix build failure with musl

 ver 0.18.19 (2014/11/26)

--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -394,10 +394,15 @@ ffmpeg_probe(Decoder *decoder, InputStream &is)
 	avpd.filename = is.uri.c_str();

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