Fix a bug introduced in SHA1:ad091eccdd.

Under some circumstances, myth's downmixer wouldn't be used even when supposed to Backport: SHA1:8678295
MythTV · Sep 28, 2011 · d7e974e · d7e974e
1 parent e16613a
commit d7e974e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -4601,9 +4601,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: