summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-06 00:51:44 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-06 00:51:44 +0000
commit422341d1cb6bc8cbb6be76eac239c40cb4061c79 (patch)
tree1a4193e699024bd53f5ef2da5d9958aa74ffbd06 /src/lib/video_decoder.cc
parent18614dda0d53b713ace5ad1df57298d049dba87f (diff)
Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."
This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
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 773688b34..891720f6b 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -51,7 +51,7 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, false, sub, t);
+ signal_video (image, false, sub);
_last_source_time = t;
}
@@ -60,14 +60,14 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
* we will generate a black frame.
*/
void
-VideoDecoder::repeat_last_video (double t)
+VideoDecoder::repeat_last_video ()
{
if (!_last_image) {
_last_image.reset (new SimpleImage (pixel_format(), native_size(), true));
_last_image->make_black ();
}
- signal_video (_last_image, true, _last_subtitle, t);
+ signal_video (_last_image, true, _last_subtitle);
}
/** Emit our signal to say that some video data is ready.
@@ -76,10 +76,10 @@ VideoDecoder::repeat_last_video (double t)
* @param sub Subtitle for this frame, or 0.
*/
void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t)
+VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
{
TIMING (N_("Decoder emits %1"), _video_frame);
- Video (image, same, sub, t);
+ Video (image, same, sub);
++_video_frame;
_last_image = image;