diff options
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 572a1c3a4..c2a6c981b 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -87,6 +87,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j) _picture_asset->set_edit_rate (_film->video_frame_rate ()); _picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ())); + _picture_asset->set_interop (_film->interop ()); if (_film->encrypted ()) { _picture_asset->set_key (_film->key ()); @@ -98,6 +99,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j) _sound_asset->set_edit_rate (_film->video_frame_rate ()); _sound_asset->set_channels (_film->audio_channels ()); _sound_asset->set_sampling_rate (_film->audio_frame_rate ()); + _sound_asset->set_interop (_film->interop ()); if (_film->encrypted ()) { _sound_asset->set_key (_film->key ()); @@ -344,6 +346,10 @@ void Writer::terminate_thread (bool can_throw) { boost::mutex::scoped_lock lock (_mutex); + if (_thread == 0) { + return; + } + _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); |