projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libcxml version requirement in wscript.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 2bacf58e73b929a57948a6097465fd90d4cd15e8..3f4cda6eb5a4345595410fe475314f3d24881bd7 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-21,38
+21,18
@@
* @brief Parent class for decoders of content.
*/
* @brief Parent class for decoders of content.
*/
-#include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
#include "film.h"
#include "film.h"
-#include "format.h"
-#include "job.h"
-#include "options.h"
-#include "exceptions.h"
-#include "image.h"
-#include "util.h"
-#include "log.h"
#include "decoder.h"
#include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
-
-using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
+
+#include "i18n.h"
+
using boost::shared_ptr;
using boost::shared_ptr;
-using boost::optional;
/** @param f Film.
/** @param f Film.
- * @param o Options.
- * @param j Job that we are running within, or 0
+ * @param o Decode options.
*/
*/
-Decoder::Decoder (
boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j
)
+Decoder::Decoder (
shared_ptr<const Film> f
)
: _film (f)
: _film (f)
- , _opt (o)
- , _job (j)
{
{
-
+
}
}