diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-05 00:50:20 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-05 00:50:20 +0000 |
| commit | ff06669bc8c14abe40cd9590afc8391f19608424 (patch) | |
| tree | 42d7e185edee041b9ab9e496fbfa4e8ee55f677b /src/lib | |
| parent | 278bfa265eed9b2fafec8b2bb5e92541a1bb23c1 (diff) | |
Fix strange behaviour with single-frame fades (#1440).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player_video.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 023ab826a..5c287dc92 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -243,7 +243,7 @@ bool PlayerVideo::same (shared_ptr<const PlayerVideo> other) const { if (_crop != other->_crop || - _fade.get_value_or(0) != other->_fade.get_value_or(0) || + _fade != other->_fade || _inter_size != other->_inter_size || _out_size != other->_out_size || _eyes != other->_eyes || diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 932977858..fe35b0df3 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -354,7 +354,9 @@ VideoContent::scale_and_crop_to_fit_height (shared_ptr<const Film> film) set_bottom_crop (0); } -/** @param f Frame index within the whole (untrimmed) content */ +/** @param f Frame index within the whole (untrimmed) content. + * @return Fade factor (between 0 and 1) or unset if there is no fade. + */ optional<double> VideoContent::fade (shared_ptr<const Film> film, Frame f) const { |