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/decoder/plugins | |
| 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/decoder/plugins')
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 5 |
1 files changed, 5 insertions, 0 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); |