summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-30 12:15:01 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-30 12:15:01 +0100
commitebabac1b19f7e039ed34f407a73f24dddaa4e493 (patch)
treebf06862b073b6d0d78c476777fa677d2ee5aca04 /src/lib
parentda360487fc8764f8591e73a8682e01b90fb9c5ab (diff)
Trim must be part of the video identifier if we are doing encode-trims.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/film.cc4
1 files changed, 4 insertions, 0 deletions
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;