summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Yves Avenard <jyavenard@mythtv.org>2011-09-28 16:22:43 (GMT)
committer Jean-Yves Avenard <jyavenard@mythtv.org>2011-09-28 16:22:43 (GMT)
commit867829521b8b8c39df68fed0b62910cb4aa7b197 (patch)
treedf62fe6563d917e231aaa71723eece6ce6518b23
parent909b444ede4dd08fe1e468b969aa9928bbc6a131 (diff)
Fix a bug introduced in SHA1:ad091eccdd.
Under some circumstances, myth's downmixer wouldn't be used even when supposed to
-rw-r--r--mythtv/libs/libmythtv/avformatdecoder.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
index 601aae5..d52661f 100644
--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
+++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -4538,9 +4538,11 @@ inline bool AvFormatDecoder::DecoderWillDownmix(const AVCodecContext *ctx)
{
// Until ffmpeg properly implements dialnorm
// use Myth internal downmixer if machines has FPU/SSE
- if (!m_audio->CanDownmix() || !AudioOutputUtil::has_hardware_fpu())
+ if (m_audio->CanDownmix() && AudioOutputUtil::has_hardware_fpu())
+ return false;
+ if (!m_audio->CanDownmix())
return true;
-
+ // use ffmpeg only for dolby codecs if we have to
switch (ctx->codec_id)
{
case CODEC_ID_AC3: