summaryrefslogtreecommitdiff
path: root/src/lib/ab_transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-02-08 13:07:16 +0000
committerCarl Hetherington <cth@carlh.net>2013-02-08 13:07:16 +0000
commit2e536ef0971edefea23810b99f7706881072783b (patch)
tree8b96ac62795a5953e942bd6fc0d35d8690b6dfce /src/lib/ab_transcoder.cc
parent567abac0d7824f27b8fdcd6fb7da7e5ddae62a0f (diff)
Shuffle Job pointers around slightly.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
-rw-r--r--src/lib/ab_transcoder.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index fc4fb8daa..f47a99fda 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -55,8 +55,8 @@ ABTranscoder::ABTranscoder (
, _job (j)
, _encoder (e)
{
- _da = decoder_factory (_film_a, o, j);
- _db = decoder_factory (_film_b, o, j);
+ _da = decoder_factory (_film_a, o);
+ _db = decoder_factory (_film_b, o);
if (_film_a->audio_stream()) {
shared_ptr<AudioStream> st = _film_a->audio_stream();
@@ -98,7 +98,9 @@ ABTranscoder::go ()
bool const vb = _db.video->pass ();
bool const a = _da.audio->pass ();
- _da.video->set_progress ();
+ if (_job) {
+ _da.video->set_progress (_job);
+ }
if (va && vb && a) {
break;