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.

decoder/ffmpeg: use avcodec_descriptor_get() to determine codec name
fe9299ce · Max Kellermann · c3f111a5 · fe9299ce · fe9299ce
Commit fe9299ce authored Aug 13, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

NEWS NEWS +2 -0

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

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.13 (not yet released)
+* decoder
+  - ffmpeg: support ffmpeg/libav version 11

 ver 0.18.12 (2014/07/30)
 * database

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