diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:58:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:58:53 +0100 |
| commit | 9facdf75a2776319fc5826cfa3dd85340f3c8879 (patch) | |
| tree | dfc19da6dd5b3aefd2cacbec817336058d9c6c02 /src/lib/player_video.cc | |
| parent | 9334a6e5ea4ba89c243b2e5d6bdb02db6aa012ff (diff) | |
Fix detection of same-frame to speed up simple encodes (#548).
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 81e01329a..0375fa01b 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -197,8 +197,7 @@ PlayerVideo::inter_position () const bool PlayerVideo::same (shared_ptr<const PlayerVideo> other) const { - if (_in != other->_in || - _crop != other->_crop || + if (_crop != other->_crop || _fade.get_value_or(0) != other->_fade.get_value_or(0) || _inter_size != other->_inter_size || _out_size != other->_out_size || @@ -206,6 +205,7 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const _part != other->_part || _colour_conversion != other->_colour_conversion || !_subtitle.same (other->_subtitle)) { + return false; } |