summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-20 14:27:00 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-20 14:27:00 +0100
commitf2caad0df1a451e2aff68dfd37277faa72116e12 (patch)
tree3ebf116a6cb847dd099ad113c80b3249d99fa264 /src/lib/video_decoder.cc
parent21ce34c2cd04a2e7e133ff693b84c054182f4f91 (diff)
Various time-related fixes; fix daft hang on decodes.
Diffstat (limited to 'src/lib/video_decoder.cc')
-rw-r--r--src/lib/video_decoder.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index a24059da2..533fdcf1a 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
@@ -41,10 +43,10 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
/** Called by subclasses to tell the world that some video data is ready.
* We find a subtitle then emit it for listeners.
* @param image frame to emit.
- * @param t Time of the frame within the source, in seconds.
+ * @param t Time of the frame within the source.
*/
void
-VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
+VideoDecoder::emit_video (shared_ptr<Image> image, bool same, Time t)
{
shared_ptr<Subtitle> sub;
if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {