diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-01 21:02:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-01 21:02:34 +0000 |
| commit | 6cd300ca8513b360990360d2999bec3b8988fd97 (patch) | |
| tree | 5a658fd7ba2cd5c5be5489d606472c774f47efb6 /src | |
| parent | c683befd52461d1aaab5908224e06675d6a4cad0 (diff) | |
| parent | 4bc431e9d9dc490560d376b1b6efb4e67c6cfb54 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index df708d923..954aff728 100644 --- 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 d104004f2..fcf7e3229 100644 --- 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 |