projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove multi-reel, for now, and sort out Size vs libdcp::Size.
[dcpomatic.git]
/
src
/
lib
/
ab_transcode_job.cc
diff --git
a/src/lib/ab_transcode_job.cc
b/src/lib/ab_transcode_job.cc
index b9538ce2e669ae2528087817b4192b810c64ff37..a6233c185783d42055be316361ff4e4713c76a3a 100644
(file)
--- a/
src/lib/ab_transcode_job.cc
+++ b/
src/lib/ab_transcode_job.cc
@@
-19,13
+19,12
@@
#include <stdexcept>
#include "ab_transcode_job.h"
#include <stdexcept>
#include "ab_transcode_job.h"
-#include "j2k_wav_encoder.h"
#include "film.h"
#include "format.h"
#include "filter.h"
#include "ab_transcoder.h"
#include "film.h"
#include "format.h"
#include "filter.h"
#include "ab_transcoder.h"
-#include "encoder_factory.h"
#include "config.h"
#include "config.h"
+#include "encoder.h"
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
@@
-54,7
+53,7
@@
ABTranscodeJob::run ()
{
try {
/* _film_b is the one with reference filters */
{
try {
/* _film_b is the one with reference filters */
- ABTranscoder w (_film_b, _film, _decode_opt, this,
encoder_factory (_film, _encode_opt
));
+ ABTranscoder w (_film_b, _film, _decode_opt, this,
shared_ptr<Encoder> (new Encoder (_film, _encode_opt)
));
w.go ();
set_progress (1);
set_state (FINISHED_OK);
w.go ();
set_progress (1);
set_state (FINISHED_OK);