Merge master.

diff --cc src/lib/ffmpeg_decoder.cc
index dae0ddbe8924b2b65fa8657a455a01128555b50f,d9b7796599b8c7cdf7687454fd6dc668db5195ef..a2b3e5d3bfdead6a8fe07a44489c87440bc228ab
--- 1/src/lib/ffmpeg_decoder.cc
--- 2/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@@ -561,11 -559,11 +561,11 @@@ FFmpegDecoder::decode_subtitle_packet (
        /* Subtitle PTS in seconds (within the source, not taking into account any of the
           source that we may have chopped off for the DCP)
        */
-       double const packet_time = static_cast<double> (sub.pts) / AV_TIME_BASE;
+       double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset;
        
        /* hence start time for this sub */
 -      Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
 -      Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
 +      ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
 +      ContentTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
  
        AVSubtitleRect const * rect = sub.rects[0];
  

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

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

diff --cc src/wx/video_panel.cc
index a777b3e88da8f317f9b0e8f3221850a3c6407c35,8854f7e7b54441c5c2689b7b157d4f71c4089384..b439d13c4e47412f1950283ae9beb584942ef85f
--- 1/src/wx/video_panel.cc
--- 2/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@@ -334,8 -334,8 +334,8 @@@ VideoPanel::setup_description (
  
        d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
        ++lines;
 -      FrameRateConversion frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
 +      FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
-       d << frc.description << "\n";
+       d << std_to_wx (frc.description) << "\n";
        ++lines;
  
        for (int i = lines; i < 6; ++i) {