summaryrefslogtreecommitdiff
path: root/src/lib/ab_transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-25 13:44:02 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-25 13:44:02 +0100
commit7b2ec1dd69951649f2c912fcf90b22913b1f6c3a (patch)
treeb25ae258f6bb14b06f6d8079f6bb8daf81811470 /src/lib/ab_transcoder.cc
parent6aa1a3e3808319d26659d3008a83f79f695fb6b2 (diff)
Remove Image::clone in favour of a copy constructor for SimpleImage; clean up A/B transcoder slightly; fix combiner if image strides differ; try to fix problems when destroying Encoders; fix SimpleImage copy constructor to cope with aligned images; don't call encoder::process_end if the encode throws an exception.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
-rw-r--r--src/lib/ab_transcoder.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 26643b50e..d8f13dae4 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -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 ();
}