From ebabac1b19f7e039ed34f407a73f24dddaa4e493 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 30 May 2013 12:15:01 +0100
Subject: Trim must be part of the video identifier if we are doing
 encode-trims.

---
 src/lib/film.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 81c7de77f..5573ee9d2 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -218,6 +218,10 @@ Film::video_state_identifier () const
 	  << "_" << j2k_bandwidth()
 	  << "_" << boost::lexical_cast<int> (colour_lut());
 
+	if (trim_type() == ENCODE) {
+		s << "_" << trim_start() << "_" << trim_end();
+	}
+
 	if (dcp_ab()) {
 		pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
 		s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
-- 
cgit v1.2.3