Merge 1.0

diff --cc src/lib/encoder.cc
Simple merge

diff --cc src/lib/player.cc
index 96d23a82b38c3244cec08e01f68016d43f52f60c,cacb42651b1656d706773a7b335c21c054af2458..c9f9acd942179561184fb2c32bd70e2ee65a24b9
--- 1/src/lib/player.cc
--- 2/src/lib/player.cc
+++ b/src/lib/player.cc
@@@ -342,8 -374,8 +342,8 @@@ Player::emit_audio (weak_ptr<Piece> wea
  void
  Player::flush ()
  {
 -      TimedAudioBuffers<Time> tb = _audio_merger.flush ();
 +      TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
-       if (tb.audio) {
+       if (_audio && tb.audio) {
                Audio (tb.audio, tb.time);
                _audio_position += _film->audio_frames_to_time (tb.audio->frames ());
        }
@@@ -352,8 -384,8 +352,8 @@@
                emit_black ();
        }
  
-       while (_audio_position < _video_position) {
+       while (_audio && _audio_position < _video_position) {
 -              emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
 +              emit_silence (_video_position - _audio_position);
        }
        
  }