From 19f94521139aac13ef8fb4eaa55855b2ada307b4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 9 May 2016 19:58:37 +0100 Subject: Move video frame rate ('prepared-for') into Content. --- src/lib/ffmpeg_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 57327b63d..68dcd5186 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -72,12 +72,12 @@ using boost::split; using dcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log, bool fast) - : VideoDecoder (c->video, log) + : VideoDecoder (c, log) , AudioDecoder (c->audio, fast, log) , SubtitleDecoder (c->subtitle) , FFmpeg (c) , _log (log) - , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video->frame_rate())) + , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->active_video_frame_rate())) { } @@ -413,7 +413,7 @@ FFmpegDecoder::decode_video_packet () double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); video ( shared_ptr (new RawImageProxy (image)), - llrint (pts * _ffmpeg_content->video->frame_rate ()) + llrint (pts * _ffmpeg_content->active_video_frame_rate ()) ); } else { LOG_WARNING_NC ("Dropping frame without PTS"); -- cgit v1.2.3