Merge master; fix crash on new film.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index b1b01d724..1fef66b88 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -36,6 +36,7 @@ class DelayLine;
 class Gain;
 class Combiner;
 class Player;
+class Trimmer;
 
 /** @class ABTranscoder
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -63,5 +64,6 @@ private:
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
 	boost::shared_ptr<Gain> _gain;
+	boost::shared_ptr<Trimmer> _trimmer;
 	boost::shared_ptr<Image> _image;
 };