diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-16 00:42:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-16 00:42:46 +0000 |
| commit | 1eb73c1d864125e209d78b992ba2c6e278e42b74 (patch) | |
| tree | 9381d47b56cef3f9cc965e80789beb43593d9647 /src/lib/external_audio_decoder.cc | |
| parent | 14b35296119dcc53ac554962438dd9b5d0ae41c0 (diff) | |
Fix a couple of thinkos in the external audio code.
Diffstat (limited to 'src/lib/external_audio_decoder.cc')
| -rw-r--r-- | src/lib/external_audio_decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/external_audio_decoder.cc b/src/lib/external_audio_decoder.cc index 768d32f6d..89e10bfc0 100644 --- a/src/lib/external_audio_decoder.cc +++ b/src/lib/external_audio_decoder.cc @@ -54,12 +54,12 @@ ExternalAudioDecoder::pass () sf_count_t frames = 0; vector<SNDFILE*> sndfiles; - for (vector<string>::const_iterator i = files.begin(); i != files.end(); ++i) { - if (i->empty ()) { + for (size_t i = 0; i < (size_t) N; ++i) { + if (files[i].empty ()) { sndfiles.push_back (0); } else { SF_INFO info; - SNDFILE* s = sf_open (i->c_str(), SFM_READ, &info); + SNDFILE* s = sf_open (files[i].c_str(), SFM_READ, &info); if (!s) { throw DecodeError ("could not open external audio file for reading"); } @@ -72,7 +72,7 @@ ExternalAudioDecoder::pass () if (first) { /* XXX: nasty magic value */ - AudioStream st ("DVDOMATIC-EXTERNAL", -1, info.samplerate, av_get_default_channel_layout (info.channels)); + AudioStream st ("DVDOMATIC-EXTERNAL", -1, info.samplerate, av_get_default_channel_layout (N)); _audio_streams.push_back (st); _audio_stream = st; frames = info.frames; |