summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-04 17:30:50 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-04 17:30:50 +0000
commit83c296968eb998ae5bdb210f37305fc49f308c4f (patch)
treede1f8171faa2cbf2f83f953b67cf1d76b8722a79 /src/lib/ffmpeg_decoder.cc
parent752bba7eb39d6f775a3ecb3ca3e19d7884626a4e (diff)
Rework counting of audio / video in the decoder a bit.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index f0e652cbe..fa6500b9e 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -270,7 +270,7 @@ FFmpegDecoder::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::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
)
);
}