diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-05 09:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-05 09:37:57 +0000 |
| commit | c8be0644833dce6ff39202430bba0ab358f3e096 (patch) | |
| tree | 1007061e5aac388825260ad1c016e8efd6f43919 /src/lib/ffmpeg.cc | |
| parent | 23690fa77d69f841569b7b7e03feb55db34622bb (diff) | |
| parent | 736f9d8154080ea5837b31af623ef863eea1a7c5 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index af6c8e167..ce87cc14f 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -381,7 +381,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option /* Now adjust so that the video pts starts on a frame */ if (first_video) { ContentTime const fvc = first_video.get() + po; - po += fvc.round_up (video_frame_rate) - fvc; + po += fvc.ceil (video_frame_rate) - fvc; } return po; |