projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fr_FR tweaks from Lilian.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index 3beda2b8b31a7625d6e45efdf614c789bb0ff250..e0f3a03a2319c02de63918a6201647c48fe478cc 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-38,7
+38,6
@@
#include "audio_decoder.h"
using std::string;
#include "audio_decoder.h"
using std::string;
-using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
@@
-72,8
+71,7
@@
Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
_decoders.video->connect_video (_matcher);
_matcher->connect_video (_encoder);
} else {
_decoders.video->connect_video (_matcher);
_matcher->connect_video (_encoder);
} else {
- /* Discard timestamps here */
- _decoders.video->Video.connect (boost::bind (&Encoder::process_video, _encoder, _1, _2, _3));
+ _decoders.video->connect_video (_encoder);
}
if (_matcher && _delay_line && _decoders.audio) {
}
if (_matcher && _delay_line && _decoders.audio) {