diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-05 10:36:55 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-05 10:36:55 +0000 |
| commit | ca4d051ceafb77c281583c4e50b391f230544313 (patch) | |
| tree | f3bb8a080dd87feae70ed90cb93d99e4bdd7e4a2 /src/lib/ffmpeg_decoder.cc | |
| parent | 10a001a0c7cf33d384d9613168d80c0c5a07426c (diff) | |
Move trimming into the encoder; seems to be cleaner.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index fa6500b9e..a2ca739e2 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) - : Decoder (f, o, j, minimal) +FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j) + : Decoder (f, o, j) , _format_context (0) , _video_stream (-1) , _audio_stream (-1) @@ -270,7 +270,7 @@ FFmpegDecoder::pass () } /* Where we are in the output, in seconds */ - double const out_pts_seconds = video_frames_in() / frames_per_second(); + double const out_pts_seconds = video_frame() / 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) @@ -292,7 +292,7 @@ FFmpegDecoder::pass () _film->log()->log ( String::compose ( "Extra frame inserted at %1s; source frame %2, source PTS %3", - out_pts_seconds, video_frames_in(), source_pts_seconds + out_pts_seconds, video_frame(), source_pts_seconds ) ); } |