diff options
Diffstat (limited to '')
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 9 | ||||
| -rw-r--r-- | src/util/ASCII.hxx | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -58,6 +58,8 @@ ver 0.19 (not yet released) * Android port ver 0.18.13 (not yet released) +* decoder + - ffmpeg: support ffmpeg/libav version 11 ver 0.18.12 (2014/07/30) * database diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 9139a622b..3c0747514 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -452,9 +452,18 @@ ffmpeg_decode(Decoder &decoder, InputStream &input) AVStream *av_stream = format_context->streams[audio_stream]; AVCodecContext *codec_context = av_stream->codec; + +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0) + const AVCodecDescriptor *codec_descriptor = + avcodec_descriptor_get(codec_context->codec_id); + if (codec_descriptor != nullptr) + FormatDebug(ffmpeg_domain, "codec '%s'", + codec_descriptor->name); +#else if (codec_context->codec_name[0] != 0) FormatDebug(ffmpeg_domain, "codec '%s'", codec_context->codec_name); +#endif AVCodec *codec = avcodec_find_decoder(codec_context->codec_id); diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx index adea6dceb..19a18a1bb 100644 --- a/src/util/ASCII.hxx +++ b/src/util/ASCII.hxx @@ -33,7 +33,7 @@ #include "Compiler.h" #include <assert.h> -#include <string.h> +#include <strings.h> /** * Determine whether two strings are equal, ignoring case for ASCII |