Skip to content

Commit

Permalink
Fix a bug introduced in SHA1:ad091eccdd.
Browse files Browse the repository at this point in the history
Under some circumstances, myth's downmixer wouldn't be used even when supposed to
  • Loading branch information
jyavenard committed Sep 28, 2011
1 parent 909b444 commit 8678295
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions mythtv/libs/libmythtv/avformatdecoder.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4538,9 +4538,11 @@ inline bool AvFormatDecoder::DecoderWillDownmix(const AVCodecContext *ctx)
{ {
// Until ffmpeg properly implements dialnorm // Until ffmpeg properly implements dialnorm
// use Myth internal downmixer if machines has FPU/SSE // 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; return true;

// use ffmpeg only for dolby codecs if we have to
switch (ctx->codec_id) switch (ctx->codec_id)
{ {
case CODEC_ID_AC3: case CODEC_ID_AC3:
Expand Down

0 comments on commit 8678295

Please sign in to comment.