projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ab_transcode_job.h
diff --git
a/src/lib/ab_transcode_job.h
b/src/lib/ab_transcode_job.h
index 5d029a18bd1fb8887a31332a3739acda54fffb7b..cd82d4247ffdf7dfc49095993466792b618c1f0f 100644
(file)
--- a/
src/lib/ab_transcode_job.h
+++ b/
src/lib/ab_transcode_job.h
@@
-23,7
+23,6
@@
#include <boost/shared_ptr.hpp>
#include "job.h"
#include <boost/shared_ptr.hpp>
#include "job.h"
-#include "options.h"
class Film;
class Film;
@@
-38,8
+37,7
@@
class ABTranscodeJob : public Job
{
public:
ABTranscodeJob (
{
public:
ABTranscodeJob (
- boost::shared_ptr<Film> f,
- DecodeOptions o
+ boost::shared_ptr<Film> f
);
std::string name () const;
);
std::string name () const;
@@
-48,5
+46,4
@@
public:
private:
/** Copy of our Film using the reference filters and scaler */
boost::shared_ptr<Film> _film_b;
private:
/** Copy of our Film using the reference filters and scaler */
boost::shared_ptr<Film> _film_b;
- DecodeOptions _decode_opt;
};
};