aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/decoder/ffmpeg_decoder_plugin.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 34d5f95a..fb910e52 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 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