diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
| commit | bd8fa9a370f1739952c83107352baa08c79d095e (patch) | |
| tree | dafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/decoder.h | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index f530de0eb..ed7eaeb17 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -33,13 +33,13 @@ #include "stream.h" class Job; -class FilmState; class Options; class Image; class Log; class DelayLine; class TimedSubtitle; class Subtitle; +class Film; /** @class Decoder. * @brief Parent class for decoders of content. @@ -51,7 +51,7 @@ class Subtitle; class Decoder { public: - Decoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool); + Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool, bool); virtual ~Decoder (); /* Methods to query our input video */ @@ -112,8 +112,8 @@ protected: int bytes_per_audio_sample () const; - /** our FilmState */ - boost::shared_ptr<const FilmState> _fs; + /** our Film */ + boost::shared_ptr<Film> _film; /** our options */ boost::shared_ptr<const Options> _opt; /** associated Job, or 0 */ |