diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-02 12:08:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-02 12:08:36 +0100 |
| commit | c2d6d07ed57707ae2342c9a0b352b7c507cd5005 (patch) | |
| tree | c4ef04b8cb4dcbc1797041436871bcaadeeeb0d9 | |
| parent | 566138f515a6d628bfbe28241422b2eadc9c790b (diff) | |
Fix PlayerVideo::has_j2k to cope with subtitles and fades.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/player_video.cc | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,7 @@ 2015-07-02 c.hetherington <cth@carlh.net> + * Fix failure to burn subs over existing DCP sources. + * Remove output gamma configuration option. 2015-07-02 Carl Hetherington <cth@carlh.net> diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 765896a0e..2b1e85fc9 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -167,14 +167,14 @@ PlayerVideo::send_binary (shared_ptr<Socket> socket) const bool PlayerVideo::has_j2k () const { - /* XXX: burnt-in subtitle; maybe other things */ + /* XXX: maybe other things */ shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in); if (!j2k) { return false; } - return _crop == Crop () && _inter_size == j2k->size(); + return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade; } Data |