Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --cc src/lib/player.cc
index f8471c752cb1838ad5841af2eb068d04acc8b96c,790d9a7188d1ec4a3995fc24be8a777ee52f1b0a..bb0aef458153034bb9b26cc2cbdfaa3cec5ce857
--- 1/src/lib/player.cc
--- 2/src/lib/player.cc
+++ b/src/lib/player.cc
@@@ -442,8 -446,15 +452,16 @@@ Player::get_subtitle_fonts (
  void
  Player::set_ignore_video ()
  {
 +      boost::mutex::scoped_lock lm (_mutex);
        _ignore_video = true;
+       _have_valid_pieces = false;
+ }
+ 
+ void
+ Player::set_ignore_audio ()
+ {
+       _ignore_audio = true;
+       _have_valid_pieces = false;
  }
  
  void

diff --cc src/lib/player.h
Simple merge