Merge master.

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index ef29d35fdde57806a2d0ef8f0a5f9a3def734789..57e3791a26a53c14584c7b0f7dd0faf86b09e70f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -170,6 +170,10 @@ Film::video_state_identifier () const
          << "_" << j2k_bandwidth()
          << "_" << lexical_cast<int> (colour_lut());
 
+       if (trim_type() == ENCODE) {
+               s << "_" << trim_start() << "_" << trim_end();
+       }
+
        if (ab()) {
                pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
                s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;