Skip to content

M
mpd
Commit d4b56994 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/ffmpeg: support planar audio

Implements Mantis feature request 3582.
parent 1dc27be0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
NEWS
View file @ d4b56994
...@@ -6,6 +6,7 @@ ver 0.17.3 (2012/??/??) ...@@ -6,6 +6,7 @@ ver 0.17.3 (2012/??/??)
- recorder, shout: support Ogg packets that span more than one page - recorder, shout: support Ogg packets that span more than one page
* decoder: * decoder:
- ffmpeg: ignore negative time stamps - ffmpeg: ignore negative time stamps
- ffmpeg: support planar audio
ver 0.17.2 (2012/09/30) ver 0.17.2 (2012/09/30)
* protocol: * protocol:
......
src/decoder/ffmpeg_decoder_plugin.c
View file @ d4b56994
...@@ -377,6 +377,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) ...@@ -377,6 +377,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
switch (sample_fmt) { switch (sample_fmt) {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
case AV_SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16:
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
case AV_SAMPLE_FMT_S16P:
#endif
#else #else
case SAMPLE_FMT_S16: case SAMPLE_FMT_S16:
#endif #endif
...@@ -384,6 +387,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) ...@@ -384,6 +387,9 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
case AV_SAMPLE_FMT_S32P:
#endif
#else #else
case SAMPLE_FMT_S32: case SAMPLE_FMT_S32:
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment