diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-02-08 13:07:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-02-08 13:07:16 +0000 |
| commit | 2e536ef0971edefea23810b99f7706881072783b (patch) | |
| tree | 8b96ac62795a5953e942bd6fc0d35d8690b6dfce /src/lib/transcoder.cc | |
| parent | 567abac0d7824f27b8fdcd6fb7da7e5ddae62a0f (diff) | |
Shuffle Job pointers around slightly.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 93963761e..959fac857 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -51,7 +51,7 @@ using boost::dynamic_pointer_cast; Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e) : _job (j) , _encoder (e) - , _decoders (decoder_factory (f, o, j)) + , _decoders (decoder_factory (f, o)) { assert (_encoder); @@ -96,7 +96,9 @@ Transcoder::go () while (1) { if (!done[0]) { done[0] = _decoders.video->pass (); - _decoders.video->set_progress (); + if (_job) { + _decoders.video->set_progress (_job); + } } if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) { |