diff options
| author | Torsten Jager <t.jager@gmx.de> | 2013-11-23 14:49:35 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2013-11-23 14:49:35 +0100 |
| commit | 1dd0d4d58e52849b6ad6db307a51b5897b4d3e58 (patch) | |
| tree | e4ec62a5fc0c17e45e7301a54c493961969636f2 | |
| parent | 09674ee9ce4513545036c01917a6ffec98db5711 (diff) | |
| download | xine-lib-1dd0d4d58e52849b6ad6db307a51b5897b4d3e58.tar.gz xine-lib-1dd0d4d58e52849b6ad6db307a51b5897b4d3e58.tar.bz2 | |
ff_audio_decoder: dont risk breaking the audio gain feature.
Lavc v54,55 seems to ignore request_sample_fmt anyway,
but that need not stay that way forever.
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index a066141d2..f190b3a31 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -177,8 +177,12 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ return; } +#if AVAUDIO < 4 /* Try to make the following true */ this->context->request_sample_fmt = AV_SAMPLE_FMT_S16; + /* For lavc v54+, we have our channel mixer that wants default float samples to fix + oversaturation via audio gain. */ +#endif /* Current ffmpeg audio decoders usually use 16 bits/sample * buf->decoder_info[2] can't be used as it doesn't refer to the output |