projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fa643b
)
Fix silly bug introduced when speeding up ImageMagick content.
author
Carl Hetherington
<cth@carlh.net>
Tue, 7 May 2013 19:53:44 +0000
(20:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 7 May 2013 19:53:44 +0000
(20:53 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index d86437cd29bb38d6ba2f0eb2f6208632db770bd6..68a962cddb56f545d10eb75b0147c224f42da959 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-78,7
+78,7
@@
Player::pass ()
if (_video && _video_decoder < _video_decoders.size ()) {
/* Run video decoder; this may also produce audio */
-
+
if (_video_decoders[_video_decoder]->pass ()) {
_video_decoder++;
}
@@
-257,6
+257,8
@@
Player::setup_decoders ()
audio_content = fc;
video_decoder = fd;
audio_decoder = fd;
+
+ video_decoder->connect_video (shared_from_this ());
}
shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);