Bump version

[dcpomatic.git] / src / lib / ab_transcoder.cc

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 26643b50edd5d3b936c1d970ae8af748faef9da3..c42f0d241f7e27fd74648d35631b492b339e63b7 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -62,7 +62,7 @@ ABTranscoder::ABTranscoder (
        _db = decoder_factory (_film_b, o);
 
        shared_ptr<AudioStream> st = _film_a->audio_stream();
-       if (st) {
+       if (st && st->sample_rate()) {
                _matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->source_frame_rate()));
        }
        _delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_delay() / 1000.0f));
@@ -122,25 +122,21 @@ ABTranscoder::go ()
                } else {
                        done[2] = true;
                }
-
+               
                if (_job) {
                        _da.video->set_progress (_job);
                }
-
+               
                if (done[0] && done[1] && done[2]) {
                        break;
                }
        }
-
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
+               
+       _delay_line->process_end ();
        if (_matcher) {
                _matcher->process_end ();
        }
-       if (_gain) {
-               _gain->process_end ();
-       }
+       _gain->process_end ();
        _encoder->process_end ();
 }