aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-05-02 20:53:15 +0200
committerMax Kellermann <max@duempel.org>2011-05-09 08:00:45 +0200
commit327d41c00f8346366f10765f2f5c8a55827ffdd3 (patch)
tree8bb391e7bd0754234d502b4e68d0f0047521a890
parent05d8ce3bcd6e19843dabf822264c2be4582c71b2 (diff)
downloadmpd-327d41c00f8346366f10765f2f5c8a55827ffdd3.tar.gz
mpd-327d41c00f8346366f10765f2f5c8a55827ffdd3.tar.xz
mpd-327d41c00f8346366f10765f2f5c8a55827ffdd3.zip
decoder/ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
fixes build with lavc 53.
-rw-r--r--NEWS2
-rw-r--r--src/decoder/ffmpeg_decoder_plugin.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index d7ecb395d..a68f83bd5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
ver 0.16.3 (2011/??/??)
* fix assertion failure in audio format mask parser
+* decoder:
+ - ffmpeg: support lavc 53
ver 0.16.2 (2011/03/18)
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 29f476ba7..76155eeef 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -160,7 +160,11 @@ ffmpeg_find_audio_stream(const AVFormatContext *format_context)
{
for (unsigned i = 0; i < format_context->nb_streams; ++i)
if (format_context->streams[i]->codec->codec_type ==
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ AVMEDIA_TYPE_AUDIO)
+#else
CODEC_TYPE_AUDIO)
+#endif
return i;
return -1;