diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-16 01:19:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 8008b81c0ccee843263e2a648707b71cc3ae081f (patch) | |
| tree | c91a8fa3363645ed39dccf1bc8c5bd944e7b80a3 /src/lib/sndfile_content.cc | |
| parent | 8109f84306e024cbbe3e386db178ce00f0a32401 (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src/lib/sndfile_content.cc')
| -rw-r--r-- | src/lib/sndfile_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index a51a7be1d..f8e58885e 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -114,6 +114,6 @@ SndfileContent::examine (shared_ptr<Job> job) DCPTime SndfileContent::full_length () const { - FrameRateChange const frc (audio->audio_video_frame_rate(), film->video_frame_rate()); + FrameRateChange const frc (audio->video_frame_rate(), film()->video_frame_rate()); return DCPTime::from_frames (audio_length() / frc.speed_up, audio->stream()->frame_rate ()); } |