summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-07 01:25:12 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-07 01:25:12 +0100
commit21ae33095a251da25b3c5a85bc52fad63e04db0b (patch)
treea67e784269fd9f1f62967cd0f660cf134848bf64 /src/lib/video_decoder.cc
parent3cc96e5cc65456f4aeb4625f56087da33da47b48 (diff)
Fix still video playback.
Diffstat (limited to 'src/lib/video_decoder.cc')
-rw-r--r--src/lib/video_decoder.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 47385cc61..fd2b28d7f 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -50,8 +50,7 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, false, sub);
- _last_source_time = t;
+ signal_video (image, false, sub, t);
}
bool
@@ -65,14 +64,14 @@ VideoDecoder::have_last_video () const
* we will generate a black frame.
*/
void
-VideoDecoder::repeat_last_video ()
+VideoDecoder::repeat_last_video (double t)
{
if (!_last_image) {
_last_image.reset (new SimpleImage (pixel_format(), native_size(), true));
_last_image->make_black ();
}
- signal_video (_last_image, true, _last_subtitle);
+ signal_video (_last_image, true, _last_subtitle, t);
}
/** Emit our signal to say that some video data is ready.
@@ -81,7 +80,7 @@ VideoDecoder::repeat_last_video ()
* @param sub Subtitle for this frame, or 0.
*/
void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
+VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t)
{
TIMING (N_("Decoder emits %1"), _video_frame);
Video (image, same, sub);
@@ -89,6 +88,7 @@ VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti
_last_image = image;
_last_subtitle = sub;
+ _last_source_time = t;
}
/** Set up the current subtitle. This will be put onto frames that