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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index df708d923d278d21d2aaab71c97e7263ef626a62..954aff728386cb198ff4d79d0839ac3bdff8f169 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -273,8 +273,6 @@ string
 FFmpeg::subtitle_id (AVSubtitle const & sub)
 {
        MD5Digester digester;
-       digester.add (sub.start_display_time);
-       digester.add (sub.end_display_time);
        digester.add (sub.pts);
        for (unsigned int i = 0; i < sub.num_rects; ++i) {
                AVSubtitleRect* rect = sub.rects[i];

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d104004f23c451ad00ed34c07c298d6e58a64c3e..fcf7e322966c6ec96ffe0de158a765ec59251516 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -461,6 +461,8 @@ VideoContent::scale_and_crop_to_fit_width ()
        set_scale (VideoContentScale (film()->container ()));
 
        int const crop = max (0, int (video_size().height - double (film()->frame_size().height) * video_size().width / film()->frame_size().width));
+       set_left_crop (0);
+       set_right_crop (0);
        set_top_crop (crop / 2);
        set_bottom_crop (crop / 2);
 }
@@ -473,6 +475,8 @@ VideoContent::scale_and_crop_to_fit_height ()
        int const crop = max (0, int (video_size().width - double (film()->frame_size().width) * video_size().height / film()->frame_size().height));
        set_left_crop (crop / 2);
        set_right_crop (crop / 2);
+       set_top_crop (0);
+       set_bottom_crop (0);
 }
 
 void