Mostly-merge master.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 53a0c31e140d6ceab0a3d2f222fe419bda88237b..0901f73b020027cc733ab325c2085f494db65d45 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,7 +21,6 @@
  *  @brief Parent class for decoders of content.
  */
 
-#include "film.h"
 #include "decoder.h"
 #include "decoded.h"
 
@@ -30,12 +29,10 @@
 using std::cout;
 using boost::shared_ptr;
 
-/** @param f Film.
- *  @param o Decode options.
+/** @param o Decode options.
  */
-Decoder::Decoder (shared_ptr<const Film> f)
-       : _film (f)
-       , _done (false)
+Decoder::Decoder ()
+       : _done (false)
 {
 
 }