From fe9299ceffcd9164a50214aee287fbf8e85dcd9f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 13 Aug 2014 18:40:39 +0200 Subject: decoder/ffmpeg: use avcodec_descriptor_get() to determine codec name In version 11, both ffmpeg and libav deprecate AVCodecContext::codec_name. The function avcodec_descriptor_get() has been introduced long ago. --- src/decoder/FfmpegDecoderPlugin.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index bcb1ae3c9..5133f91ac 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -433,9 +433,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); -- cgit v1.2.3