From 327d41c00f8346366f10765f2f5c8a55827ffdd3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 2 May 2011 20:53:15 +0200 Subject: decoder/ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc fixes build with lavc 53. --- NEWS | 2 ++ src/decoder/ffmpeg_decoder_plugin.c | 4 ++++ 2 files changed, 6 insertions(+) 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; -- cgit v1.2.3