From 1a111ac43a3648d27dc0d7d586d4f9e93e2aa40f Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mythtv.org>
Date: Fri, 21 Jun 2013 20:49:49 +1000
Subject: [PATCH] Revert "AudioOutputBase: Fix Coverity 746810. Dereference
 after null check. False positive, and flagged as such with Coverity, but
 applying a 'fix' anyway to keep other SA tools quiet."

This reverts commit 3e30a164ddf761c2dfa2b2a50ddaea09669d63b3.
---
 mythtv/libs/libmyth/audio/audiooutputbase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
index de8481780b1..8bd5bc4528a 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -1226,7 +1226,7 @@ int AudioOutputBase::CopyWithUpmix(char *buffer, int frames, uint &org_waud)
     int bpf   = bytes_per_frame;
     int off   = 0;
 
-    if (!needs_upmix || !upmixer)
+    if (!needs_upmix)
     {
         int num  = len;