diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-03 09:16:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-08-03 09:16:27 +0200 |
| commit | 5254047c3ad8c8c4b7ed7bf5b735b8448fcf1c29 (patch) | |
| tree | 21671f3baaa1db61e20e22906ad071b987b615bd /src/lib/ffmpeg_content.cc | |
| parent | 061466f78357b15ad39f699b1f03c9c4fa35954e (diff) | |
| parent | 591c73b472f0eb74225dbc1b08885f552b8814c4 (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index f3c0d01cb..1fb95535f 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -337,6 +337,14 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) set_default_colour_conversion (); } + if (examiner->has_video() && examiner->pulldown() && video_frame_rate() && fabs(*video_frame_rate() - 29.97) < 0.001) { + /* FFmpeg has detected this file as 29.97 and the examiner thinks it is using "soft" 2:3 pulldown (telecine). + * This means we can treat it as a 23.976fps file. + */ + set_video_frame_rate (24000.0 / 1001); + video->set_length (video->length() * 24.0 / 30); + } + #ifdef DCPOMATIC_VARIANT_SWAROOP _id = examiner->id (); #endif |