diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-05 01:06:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-05 01:06:25 +0000 |
| commit | 6f3505df53239cb0119519ad8318044b74d6e9d9 (patch) | |
| tree | 4e5086d976b825ec6e8e80c10fd4431752f46c3a /src/lib | |
| parent | 1650f9f85c3f110cc9cf8d8e2df01fcdd933fdee (diff) | |
Warning fixes.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_analysis.cc | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_encoder.cc | 6 |
2 files changed, 4 insertions, 4 deletions
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); |