oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: support planar audio 

Implements Mantis feature request 3582.
This commit is contained in:
Max Kellermann 2012-10-05 15:27:04 +02:00
parent 1dc27be015
commit d4b5699403
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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:

6
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -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)
#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