diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-24 15:16:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-24 15:16:30 +0000 |
| commit | 71ea64782f215c605877f5c231a2a8b1838fe8bd (patch) | |
| tree | 3834141efc971fcc3edaac103bcb3962243673c1 /src | |
| parent | feea01f6109e00fddaacc9ae23f4cf6f55b4cabf (diff) | |
| parent | 477e619088ed1f3f4a7b043af1cca72e19acab0d (diff) | |
Merge in 0.70 branch with 0.71 fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/encoder.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index efedfcfef..910d7c58e 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -350,6 +350,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data) if (this_range.second < required_range.first || required_range.second < this_range.first) { /* No part of this audio is within the required range */ + _audio_frame += data->frames(); return; } else if (required_range.first >= this_range.first && required_range.first < this_range.second) { /* Trim start */ |