diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
| commit | e163200eaaf65c63d5105949432140f4084de037 (patch) | |
| tree | 7c35507485aa46b79627c10a215023311e41b6bb /src/lib/dcp_decoder.cc | |
| parent | 8ff6586d568c4a2b0a2ac24e690d172f4c01e3c4 (diff) | |
| parent | f4f6f4828430dc72e0276c245d32fde228aaa176 (diff) | |
Merge branch '2389-vpos'
Here we are trying to fix a variety of confusions related to vertical
subtitle position (#2389).
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 0f4e1afa1..e82e9e958 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -304,7 +304,7 @@ DCPDecoder::pass_texts ( ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) ), strings, - _dcp_content->standard() + asset->subtitle_standard() ); strings.clear (); } @@ -340,7 +340,7 @@ DCPDecoder::pass_texts ( ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) ), strings, - _dcp_content->standard() + asset->subtitle_standard() ); strings.clear (); } |
