From 8694574f6329ad6e55b9a6673506eca697da360d Mon Sep 17 00:00:00 2001 From: Viliam Mateicka Date: Mon, 2 Mar 2009 20:07:19 +0100 Subject: ffmpeg: use ffmpeg's sampleformat for output format --- src/decoder/ffmpeg_plugin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index b24685980..02a1f836b 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -273,7 +273,12 @@ ffmpeg_decode_internal(struct ffmpeg_context *ctx) codec_context->channels = 2; } - audio_format.bits = (uint8_t)16; +#if LIBAVCODEC_VERSION_INT > ((51<<16)+(41<<8)+0) + audio_format.bits = (uint8_t) av_get_bits_per_sample_format(codec_context->sample_fmt); +#else + /* XXX fixme 16-bit for older ffmpeg (13 Aug 2007) */ + audio_format.bits = (uint8_t) 16; +#endif audio_format.sample_rate = (unsigned int)codec_context->sample_rate; audio_format.channels = codec_context->channels; -- cgit v1.2.3