diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
| commit | f861018389acd9d277fe34d7621182b9b54f977f (patch) | |
| tree | 499bae7640ce99a13c31ea9c870d426084480aec /src/lib/transcoder.h | |
| parent | f09c6b53f155de601900afa90045059b20310c0d (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master; fix crash on new film.
Diffstat (limited to 'src/lib/transcoder.h')
| -rw-r--r-- | src/lib/transcoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h index ecc8ebf62..97ecaabfc 100644 --- a/src/lib/transcoder.h +++ b/src/lib/transcoder.h @@ -31,6 +31,7 @@ class VideoFilter; class Gain; class DelayLine; class Player; +class Trimmer; /** @class Transcoder * @@ -58,4 +59,5 @@ protected: boost::shared_ptr<Matcher> _matcher; boost::shared_ptr<DelayLine> _delay_line; boost::shared_ptr<Gain> _gain; + boost::shared_ptr<Trimmer> _trimmer; }; |