Remove some compilation warnings

MythTV · Dec 14, 2010 · eb858c5 · eb858c5
1 parent f087394
commit eb858c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -3926,7 +3926,6 @@ bool AvFormatDecoder::ProcessAudioPacket(AVStream *curstream, AVPacket *pkt,
     int audSubIdx = selectedTrack[kTrackTypeAudio].av_substream_index;
     avcodeclock->unlock();
 
-    uint ofill = 0, ototal = 0, othresh = 0, total_decoded_audio = 0;
     allowedquit = (!(decodetype & kDecodeAudio)) &&
         m_audio->IsBufferAlmostFull();
 
@@ -4104,8 +4103,6 @@ bool AvFormatDecoder::ProcessAudioPacket(AVStream *curstream, AVPacket *pkt,
 
         m_audio->AddAudioData((char *)audioSamples, data_size, temppts);
 
-        total_decoded_audio += data_size;
-
         allowedquit |= ringBuffer->InDVDMenuOrStillFrame();
 
         tmp_pkt.data += ret;

diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
@@ -1121,19 +1121,15 @@ AudioAdvancedSettings::AudioAdvancedSettings(bool mpcm)
         new HorizontalConfigurationGroup(false, false);
     settings5->addChild(Audio48kOverride());
 
-    ConfigurationGroup *settings6;
-
-    if (mpcm)
-    {
-        settings6 = new HorizontalConfigurationGroup(false, false);
-        settings6->addChild(MPCM());
-    }
-
     addChild(settings4);
     addChild(settings5);
     addChild(settings3);
+
     if (mpcm)
     {
+        ConfigurationGroup *settings6;
+        settings6 = new HorizontalConfigurationGroup(false, false);
+        settings6->addChild(MPCM());
         addChild(settings6);
     }
 }