Merge master.

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

diff --cc src/lib/ffmpeg_examiner.cc
index d9bcedfc528f196ba9a85b064d1f3900f32fdbbc,bc82a9700f8c3b254ea287c43483919299a37de7..949062f5bd5c3a9e5b1eace869ffc4474007560f
--- 1/src/lib/ffmpeg_examiner.cc
--- 2/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@@ -64,16 -61,9 +64,16 @@@ FFmpegExaminer::FFmpegExaminer (shared_
                }
        }
  
 -      /* Run through until we find the first audio (for each stream) and video */
 -
 +      /* Run through until we find:
 +       *   - the first video.
 +       *   - the first audio for each stream.
 +       *   - the subtitle periods for each stream.
 +       *
 +       * We have to note subtitle periods as otherwise we have no way of knowing
 +       * where we should look for subtitles (video and audio are always present,
 +       * so they are ok).
 +       */
-       while (1) {
+       while (true) {
                int r = av_read_frame (_format_context, &_packet);
                if (r < 0) {
                        break;

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

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

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

diff --cc src/lib/server.cc
index fe792e307424501b2c8a6df845c4b202f01d1504,f1c6d6c44afd0e34d6eb3436a1a493042a6a52c8..9d1925de1a4a2c80cf0167b5f484e099c6237aab
--- 1/src/lib/server.cc
--- 2/src/lib/server.cc
+++ b/src/lib/server.cc
@@@ -136,9 -115,9 +136,9 @@@ Server::process (shared_ptr<Socket> soc
  void
  Server::worker_thread ()
  {
-       while (1) {
+       while (true) {
                boost::mutex::scoped_lock lock (_worker_mutex);
 -              while (_queue.empty ()) {
 +              while (_queue.empty () && !_terminate) {
                        _empty_condition.wait (lock);
                }
  

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

diff --cc src/lib/update.cc
index c7527ee493624247468b365cde6b2363acb5496f,af3e46f0e7d14ea1abb8d64c4c4e467143588547..44ecbb232c26b03214f23d3191c54fedd9a9071a
--- 1/src/lib/update.cc
--- 2/src/lib/update.cc
+++ b/src/lib/update.cc
@@@ -90,8 -85,7 +90,8 @@@ UpdateChecker::run (
  void
  UpdateChecker::thread ()
  {
-       while (1) {
+       while (true) {
 +              /* Block until there is something to do */
                boost::mutex::scoped_lock lock (_process_mutex);
                while (_to_do == 0) {
                        _condition.wait (lock);

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

diff --cc src/tools/dcpomatic.cc
Simple merge

diff --cc src/tools/dcpomatic_cli.cc
Simple merge

diff --cc src/tools/dcpomatic_create.cc
Simple merge

diff --cc src/tools/dcpomatic_kdm.cc
Simple merge

diff --cc src/tools/server_test.cc
Simple merge

diff --cc src/wx/film_editor.cc
Simple merge

diff --cc test/job_test.cc
Simple merge