Merge master.

diff --cc ChangeLog
index cb4d1c3c7d74511b0e682af494b31f1dfc8bb1c6,67a818f3e15cdfca381d510e5c6acfce7f0fb3fd..12d262f4b595944f1ba520248f0aa9335915ba0f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,28 +1,32 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-06-30  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.72.0 released.
+ 
+ 2014-06-28  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.71.2 released.
+ 
+ 2014-06-28  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.71.1 released.
+ 
+ 2014-06-28  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix crash on analysing audio (and possibly DCP creation) with
+       resampled content.
+ 
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.71.0 released.
+ 
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix up/down buttons in content list.
+ 
  2014-06-26  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.70.1 released.

diff --cc src/lib/playlist.cc
index 710b9cc099ea5a9e96f6118f836c9ff1ab8c1cc9,df3e633036f174fe609f192f3f3eba370eed062f..1c65d1326b3d57e74e8b819553388c97bca94570
--- 1/src/lib/playlist.cc
--- 2/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@@ -366,8 -362,9 +366,9 @@@ Playlist::move_earlier (shared_ptr<Cont
        if (previous == _content.end ()) {
                return;
        }
+ 
        
 -      Time const p = (*previous)->position ();
 +      DCPTime const p = (*previous)->position ();
        (*previous)->set_position (p + c->length_after_trim ());
        c->set_position (p);
        sort (_content.begin(), _content.end(), ContentSorter ());
@@@ -392,8 -389,25 +393,8 @@@ Playlist::move_later (shared_ptr<Conten
                return;
        }
  
 -      Time const p = (*next)->position ();
 +      DCPTime const p = (*next)->position ();
        (*next)->set_position (c->position ());
-       c->set_position (p + c->length_after_trim ());
+       c->set_position (c->position() + c->length_after_trim ());
        sort (_content.begin(), _content.end(), ContentSorter ());
  }
 -
 -FrameRateChange
 -Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
 -{
 -      for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
 -              shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
 -              if (!vc) {
 -                      continue;
 -              }
 -
 -              if (vc->position() >= t && t < vc->end()) {
 -                      return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
 -              }
 -      }
 -
 -      return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
 -}

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

diff --cc src/wx/wscript
Simple merge