diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-12 23:06:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-12 23:06:05 +0100 |
| commit | 141f9a795381fa3bbd3f2bcbd19975dfd8a8c35e (patch) | |
| tree | 0b69ad9bc37d79063bd5413aedc7e77162d217d9 | |
| parent | e846c98e5f64d3179fb2eebefb0c76b57bc53b93 (diff) | |
Merge mistake.
| -rw-r--r-- | src/lib/player.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index d0eb27aa3..8df7ec323 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -500,6 +500,8 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) min (AudioFrame (all->audio->frames()), length_frames) - offset.frames (_film->audio_frame_rate ()) ); } + + return audio; } VideoFrame |