From: Carl Hetherington <cth@carlh.net>
Date: Mon, 5 Feb 2018 01:06:25 +0000 (+0000)
Subject: Warning fixes.
X-Git-Tag: v2.11.49~5
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6f3505df53239cb0119519ad8318044b74d6e9d9

Warning fixes.
---

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 16deacbd1..61cdd5fcc 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -181,7 +181,7 @@ AudioAnalysis::overall_sample_peak () const
 	DCPOMATIC_ASSERT (!_sample_peak.empty ());
 
 	optional<PeakTime> pt;
-	int c;
+	int c = 0;
 
 	for (size_t i = 0; i < _sample_peak.size(); ++i) {
 		if (!pt || _sample_peak[i].peak > pt->peak) {
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index c96f1b5e5..a8a033990 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -211,9 +211,9 @@ FFmpegEncoder::go ()
 		_butler->get_audio (interleaved, audio_frames);
 		/* XXX: inefficient; butler interleaves and we deinterleave again */
 		float* p = interleaved;
-		for (int i = 0; i < audio_frames; ++i) {
-			for (int j = 0; j < _output_audio_channels; ++j) {
-				deinterleaved->data(j)[i] = *p++;
+		for (int j = 0; j < audio_frames; ++j) {
+			for (int k = 0; k < _output_audio_channels; ++k) {
+				deinterleaved->data(k)[j] = *p++;
 			}
 		}
 		audio (deinterleaved, i);
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 5e75266ea..3287fc651 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -394,7 +394,7 @@ dump_dkdm_group (shared_ptr<DKDMGroup> group, int indent)
 		if (g) {
 			dump_dkdm_group (g, indent + 2);
 		} else {
-			for (int i = 0; i < indent; ++i) {
+			for (int j = 0; j < indent; ++j) {
 				cout << " ";
 			}
 			shared_ptr<DKDM> d = dynamic_pointer_cast<DKDM>(i);