diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-10 21:39:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-10 21:39:18 +0000 |
| commit | 17f9254f68fabfe5d8136d256b69a65fc58724ee (patch) | |
| tree | 238ea1950efc6c83aa9e1fda0db0598652855a5e | |
| parent | 54fd4b7a1cce851b528df6741d2cf7a3291135fe (diff) | |
Use av_guess_frame_rate rather than av_stream_get_r_frame_rate;
helps with #1030. I hope this isn't a bad idea; this commit
should be reverted if there any hints of misread video frame rates.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 6 |
2 files changed, 4 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2018-02-10 Carl Hetherington <cth@carlh.net> + * Use a different way of getting frame rate from video content; may + fix #1030. + * Version 2.11.53 released. 2018-02-09 Carl Hetherington <cth@carlh.net> diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 697bfe3ae..6c76ba5a4 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -193,11 +193,7 @@ optional<double> FFmpegExaminer::video_frame_rate () const { DCPOMATIC_ASSERT (_video_stream); - /* This use of r_frame_rate is debateable; there's a few different - * frame rates in the format context, but this one seems to be the most - * reliable. - */ - return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream.get()])); + return av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0)); } dcp::Size |