Warning fixes.

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 16deacbd14582b4e85e32263bebc1b11514f2959..61cdd5fcce2b61a2d9d121038d4f86b6060b1281 100644 (file)
--- 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 c96f1b5e554c1005cb455d54f61d244e8d28862e..a8a03399098ea7919dc91aba4f90b352e23f1ee8 100644 (file)
--- 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 5e75266ea7ed9c6577baa5793d07d4adff3b350b..3287fc651db94a1e661d6102e0efe8a590e70930 100644 (file)
--- 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);