commit 08aaef641f0a61a611eeaa8a98f822e6853968a1
Author: Mark Spieth <mspieth@digivation.com.au>
Date:   Mon Sep 13 11:11:56 2010 +1000

    audio bits for smoother-vsync

diff --git a/mythtv/libs/libmyth/audiooutputbase.cpp b/mythtv/libs/libmyth/audiooutputbase.cpp
index 85abfe3..55b6e30 100644
--- a/mythtv/libs/libmyth/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audiooutputbase.cpp
@@ -285,6 +285,7 @@ bool AudioOutputBase::ToggleUpmix(void)
         return false;
 
     upmix_default = !upmix_default;
+    reset_active.Ref();
 
     const AudioSettings settings(format, source_channels, codec,
                                  source_samplerate, passthru);
diff --git a/mythtv/libs/libmythfreesurround/freesurround.cpp b/mythtv/libs/libmythfreesurround/freesurround.cpp
index 85a92f4..61593f7 100644
--- a/mythtv/libs/libmythfreesurround/freesurround.cpp
+++ b/mythtv/libs/libmythfreesurround/freesurround.cpp
@@ -289,7 +289,7 @@ uint FreeSurround::putFrames(void* buffer, uint numFrames, uint numChannels)
     }
 
     VERBOSE(VB_AUDIO+VB_TIMESTAMP+VB_EXTRA,
-            QString("FreeSurround::putFrames %1 #ch %2 used %4 generated %5")
+            QString("FreeSurround::putFrames %1 #ch %2 used %3 generated %4")
             .arg(numFrames).arg(numChannels).arg(i).arg(out_count));
 
     return i;