From d4b5699403b60c5143e213c4239d11cd3497abb6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 5 Oct 2012 15:27:04 +0200
Subject: [PATCH] decoder/ffmpeg: support planar audio

Implements Mantis feature request 3582.
---
 NEWS                                | 1 +
 src/decoder/ffmpeg_decoder_plugin.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 34d5f95aa..fb910e524 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ ver 0.17.3 (2012/??/??)
   - recorder, shout: support Ogg packets that span more than one page
 * decoder:
   - ffmpeg: ignore negative time stamps
+  - ffmpeg: support planar audio
 
 ver 0.17.2 (2012/09/30)
 * protocol:
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 59a6632d5..72a5ff341 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