projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 7c75597eac352ea77179c9d28625ef35e7cff7de..09f1f55a32cdc3a909448d37642278d59b5961ea 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-134,13
+134,13
@@
Player::set_progress (shared_ptr<Job> job)
}
void
}
void
-Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s, double t)
+Player::process_video (shared_ptr<
const
Image> i, bool same, shared_ptr<Subtitle> s, double t)
{
Video (i, same, s, _video_start[_video_decoder] + t);
}
void
{
Video (i, same, s, _video_start[_video_decoder] + t);
}
void
-Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<AudioBuffers> b, double t)
+Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<
const
AudioBuffers> b, double t)
{
AudioMapping mapping = _film->audio_mapping ();
if (!_audio_buffers) {
{
AudioMapping mapping = _film->audio_mapping ();
if (!_audio_buffers) {
@@
-176,6
+176,10
@@
Player::seek (double t)
_have_valid_decoders = true;
}
_have_valid_decoders = true;
}
+ if (_video_decoders.empty ()) {
+ return true;
+ }
+
/* Find the decoder that contains this position */
_video_decoder = 0;
while (1) {
/* Find the decoder that contains this position */
_video_decoder = 0;
while (1) {