Merge master.

diff --cc src/picture_asset.cc
index 564ada796ee927ea2f7bafa277f78d8799c3db35,8f1fe0cc3cce6ff02173240d02d9f178ca5b87f9..c3b496687a89aaeb436eb97de63e88940194e673
--- 1/src/picture_asset.cc
--- 2/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@@ -438,12 -424,12 +438,12 @@@ MonoPictureAssetWriter::write (uint8_t
        if (_frames_written == 0) {
                /* This is our first frame; set up the writer */
                
 -              _j2k_parser.FillPictureDescriptor (_picture_descriptor);
 -              _picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
 +              _state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor);
 +              _state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
        
 -              MXFAsset::fill_writer_info (&_writer_info, _asset->uuid());
 +              MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid());
                
-               if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().c_str(), _state->writer_info, _state->picture_descriptor))) {
 -              if (ASDCP_FAILURE (_mxf_writer.OpenWrite (_asset->path().string().c_str(), _writer_info, _picture_descriptor))) {
++              if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->picture_descriptor))) {
                        throw MXFFileError ("could not open MXF file for writing", _asset->path().string());
                }
        }

diff --cc src/sound_asset.cc
index 08ca71e513e980381bb832269b44ea9dbedebdbb,c6b6ac93c22e841a5557afcd3e503903a7b4f9e7..b7253917eaa46e2837d48b0f5f1783e2dab934ac
--- 1/src/sound_asset.cc
--- 2/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@@ -337,23 -328,23 +337,23 @@@ SoundAssetWriter::SoundAssetWriter (Sou
        , _frame_buffer_offset (0)
  {
        /* Derived from ASDCP::Wav::SimpleWaveHeader::FillADesc */
 -      _audio_desc.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
 -      _audio_desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 1);
 -      _audio_desc.Locked = 0;
 -      _audio_desc.ChannelCount = _asset->channels ();
 -      _audio_desc.QuantizationBits = 24;
 -      _audio_desc.BlockAlign = 3 * _asset->channels();
 -      _audio_desc.AvgBps = _asset->sampling_rate() * _audio_desc.BlockAlign;
 -      _audio_desc.LinkedTrackID = 0;
 -      _audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE;
 +      _state->audio_desc.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
 +      _state->audio_desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 1);
 +      _state->audio_desc.Locked = 0;
 +      _state->audio_desc.ChannelCount = _asset->channels ();
 +      _state->audio_desc.QuantizationBits = 24;
 +      _state->audio_desc.BlockAlign = 3 * _asset->channels();
 +      _state->audio_desc.AvgBps = _asset->sampling_rate() * _state->audio_desc.BlockAlign;
 +      _state->audio_desc.LinkedTrackID = 0;
 +      _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE;
        
 -      _frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_audio_desc));
 -      _frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_audio_desc));
 -      memset (_frame_buffer.Data(), 0, _frame_buffer.Capacity());
 +      _state->frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
 +      _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
 +      memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
        
 -      MXFAsset::fill_writer_info (&_writer_info, _asset->uuid ());
 +      MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid ());
        
-       if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().c_str(), _state->writer_info, _state->audio_desc))) {
 -      if (ASDCP_FAILURE (_mxf_writer.OpenWrite (_asset->path().string().c_str(), _writer_info, _audio_desc))) {
++      if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc))) {
                throw FileError ("could not open audio MXF for writing", _asset->path().string());
        }
  }