From e39382dedd224a97a896034c43772fa3da924b15 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 5 Oct 2012 16:35:45 +0200 Subject: decoder/ffmpeg: ignore negative time stamps Works around assertion failure in decoder_timestamp(). --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index b280e616..34d5f95a 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ ver 0.17.3 (2012/??/??) - recorder: fix I/O error check - shout: fix memory leak in error handler - recorder, shout: support Ogg packets that span more than one page +* decoder: + - ffmpeg: ignore negative time stamps ver 0.17.2 (2012/09/30) * protocol: -- cgit v1.2.3 From d4b5699403b60c5143e213c4239d11cd3497abb6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 5 Oct 2012 15:27:04 +0200 Subject: decoder/ffmpeg: support planar audio Implements Mantis feature request 3582. --- NEWS | 1 + src/decoder/ffmpeg_decoder_plugin.c | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'NEWS') 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 -- cgit v1.2.3