From 17f9254f68fabfe5d8136d256b69a65fc58724ee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Feb 2018 21:39:18 +0000 Subject: 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. --- src/lib/ffmpeg_examiner.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib') 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 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 -- cgit v1.2.3