diff options
| author | Max Kellermann <max@duempel.org> | 2012-10-05 15:27:04 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-10-05 16:40:25 +0200 |
| commit | d4b5699403b60c5143e213c4239d11cd3497abb6 (patch) | |
| tree | 98cfcb89d16f3cc48567eee48122f3d438ae0b5b | |
| parent | 1dc27be015622118a216284351915d7d7cceb153 (diff) | |
| download | mpd-d4b5699403b60c5143e213c4239d11cd3497abb6.tar.gz mpd-d4b5699403b60c5143e213c4239d11cd3497abb6.tar.xz mpd-d4b5699403b60c5143e213c4239d11cd3497abb6.zip | |
decoder/ffmpeg: support planar audio
Implements Mantis feature request 3582.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -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 |