diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-05 11:48:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-05 11:48:54 +0100 |
| commit | b60186064405914b41780021f74dd7830f2ffecb (patch) | |
| tree | e5a1f1522dc8c96c981e8c91f3338d60ec198f7a /src/lib/audio_content.cc | |
| parent | 3f9891137747cd7434ce20f69b8d88b967dbdfaf (diff) | |
Back port active_frame_rate_change stuff from v2, removing specification of video frame rate for sndfile sources.
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 7d77154e1..bf00b672a 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -160,7 +160,7 @@ AudioContent::output_audio_frame_rate () const /* Resample to a DCI-approved sample rate */ double t = dcp_audio_frame_rate (content_audio_frame_rate ()); - FrameRateChange frc (video_frame_rate(), film->video_frame_rate()); + FrameRateChange frc = film->active_frame_rate_change (position ()); /* Compensate if the DCP is being run at a different frame rate to the source; that is, if the video is run such that it will |