summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/film.cc2
-rw-r--r--src/lib/trimmer.cc7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 217673a7f..1d4d050bc 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -695,7 +695,7 @@ Film::read_metadata ()
_dirty = false;
- _log->log (String::compose ("Loaded film with use_content_audio = %1", use_content_audio ()));
+ _log->log (String::compose ("Loaded film with use_content_audio = %1", _use_content_audio));
}
libdcp::Size
diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
index 1ec9e2a5b..99f04793f 100644
--- a/src/lib/trimmer.cc
+++ b/src/lib/trimmer.cc
@@ -62,8 +62,15 @@ Trimmer::Trimmer (
the current set of regression tests). This could be
removed if a) the regression tests are regenerated and b) I
can work out what DCP length should be.
+
+ There is also a problem whereby black video frames inserted
+ at the start of the output by the matcher are not taken into account,
+ so if black frames are inserted it means more gets trimmed off the
+ end than should be. Hack around this in similar fashion with the
+ _video_end = INT_MAX line.
*/
if (video_trim_end == 0) {
+ _video_end = INT_MAX;
_audio_end = INT64_MAX;
}
}