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 /src/decoder | |
| parent | 1dc27be015622118a216284351915d7d7cceb153 (diff) | |
decoder/ffmpeg: support planar audio
Implements Mantis feature request 3582.
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 |