projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video...
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index e723610b320056668afc5328d59eca49b5213c5d..e0a7576eeaf5c51670cf1702c6b7b4597467db15 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-49,7
+49,7
@@
VideoDecoder::emit_video (shared_ptr<Image> image, double t)
sub = _timed_subtitle->subtitle ();
}
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, sub);
+ signal_video (image,
false,
sub);
_last_source_time = t;
}
_last_source_time = t;
}
@@
-61,14
+61,14
@@
VideoDecoder::repeat_last_video ()
_last_image->make_black ();
}
_last_image->make_black ();
}
- signal_video (_last_image, _last_subtitle);
+ signal_video (_last_image,
true,
_last_subtitle);
}
void
}
void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+VideoDecoder::signal_video (shared_ptr<Image> image,
bool same,
shared_ptr<Subtitle> sub)
{
TIMING ("Decoder emits %1", _video_frame);
{
TIMING ("Decoder emits %1", _video_frame);
- Video (image, sub);
+ Video (image, s
ame, s
ub);
++_video_frame;
_last_image = image;
++_video_frame;
_last_image = image;