diff options
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 09f699543..fa6500b9e 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -55,8 +55,8 @@ using std::vector; using std::stringstream; using boost::shared_ptr; -FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal, bool ignore_length) - : Decoder (f, o, j, minimal, ignore_length) +FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal) + : Decoder (f, o, j, minimal) , _format_context (0) , _video_stream (-1) , _audio_stream (-1) @@ -218,7 +218,7 @@ FFmpegDecoder::setup_subtitle () bool -FFmpegDecoder::do_pass () +FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); @@ -270,7 +270,7 @@ FFmpegDecoder::do_pass () } /* Where we are in the output, in seconds */ - double const out_pts_seconds = video_frame_index() / frames_per_second(); + double const out_pts_seconds = video_frames_in() / frames_per_second(); /* Where we are in the source, in seconds */ double const source_pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base) @@ -291,8 +291,8 @@ FFmpegDecoder::do_pass () repeat_last_video (); _film->log()->log ( String::compose ( - "Extra frame inserted at %1s; DCP frame %2, source PTS %3", - out_pts_seconds, video_frame_index(), source_pts_seconds + "Extra frame inserted at %1s; source frame %2, source PTS %3", + out_pts_seconds, video_frames_in(), source_pts_seconds ) ); } |