projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bfb7e79
)
Try to fix Windows build.
author
Carl Hetherington
<cth@carlh.net>
Sat, 23 Mar 2019 07:52:10 +0000
(07:52 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 23 Mar 2019 07:52:10 +0000
(07:52 +0000)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 96c963e7093ec166c8f392de4e41120fac9fdc2b..c09bcd9feb4fbae78297303d16e72aada60c85e1 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-517,8
+517,8
@@
Player::get_reel_assets ()
int64_t const reel_duration = k->main_picture()->duration();
/* See doc/design/trim_reels.svg */
int64_t const reel_duration = k->main_picture()->duration();
/* See doc/design/trim_reels.svg */
- Frame const reel_trim_start = min(reel_duration, max(0L, trim_start - offset_from_start));
- Frame const reel_trim_end = min(reel_duration, max(0L, reel_duration - (offset_from_end - trim_end)));
+ Frame const reel_trim_start = min(reel_duration, max(0L
L
, trim_start - offset_from_start));
+ Frame const reel_trim_end = min(reel_duration, max(0L
L
, reel_duration - (offset_from_end - trim_end)));
DCPTime const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
if (j->reference_video ()) {
DCPTime const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
if (j->reference_video ()) {