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_factory.h | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/decoder_factory.h')
| -rw-r--r-- | src/lib/decoder_factory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h index 36c14951f..81dcec944 100644 --- a/src/lib/decoder_factory.h +++ b/src/lib/decoder_factory.h @@ -22,11 +22,11 @@ */ class Decoder; -class FilmState; +class Film; class Options; class Job; class Log; extern boost::shared_ptr<Decoder> decoder_factory ( - boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool minimal = false, bool ignore_length = false + boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool minimal = false, bool ignore_length = false ); |