projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90f9013
)
Fix crash when repeating video frames across a reel boundary.
author
Carl Hetherington
<cth@carlh.net>
Fri, 27 Nov 2015 20:27:47 +0000
(20:27 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 27 Nov 2015 20:27:47 +0000
(20:27 +0000)
src/lib/encoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index 2e116328b4fd4adf72bd43ddb37773d2fa6069d6..f48da1d3a1333edcc3999102c6b20a2c530c2747 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-226,7
+226,7
@@
Encoder::enqueue (shared_ptr<PlayerVideo> pv)
} else if (pv->has_j2k ()) {
/* This frame already has JPEG2000 data, so just write it */
_writer->write (pv->j2k(), _position, pv->eyes ());
- } else if (_last_player_video && pv->same (_last_player_video)) {
+ } else if (_last_player_video &&
_writer->can_repeat(_position) &&
pv->same (_last_player_video)) {
_writer->repeat (_position, pv->eyes ());
} else {
/* Queue this new frame for encoding */