From d4b5699403b60c5143e213c4239d11cd3497abb6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 5 Oct 2012 15:27:04 +0200 Subject: decoder/ffmpeg: support planar audio Implements Mantis feature request 3582. --- src/decoder/ffmpeg_decoder_plugin.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/decoder') diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 59a6632d..72a5ff34 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -377,6 +377,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) switch (sample_fmt) { #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1) case AV_SAMPLE_FMT_S16: +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) + case AV_SAMPLE_FMT_S16P: +#endif #else case SAMPLE_FMT_S16: #endif @@ -384,6 +387,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1) case AV_SAMPLE_FMT_S32: +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) + case AV_SAMPLE_FMT_S32P: +#endif #else case SAMPLE_FMT_S32: #endif -- cgit v1.2.3