Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

1 files changed, 7 insertions, 0 deletions

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;
 	}
 }