projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e6ebf3
)
Somewhat speculative shuffler fix for assertion failure.
v2.13.13
author
Carl Hetherington
<cth@carlh.net>
Sat, 7 Apr 2018 21:34:07 +0000
(22:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 7 Apr 2018 21:34:07 +0000
(22:34 +0100)
src/lib/shuffler.cc
patch
|
blob
|
history
diff --git
a/src/lib/shuffler.cc
b/src/lib/shuffler.cc
index 59656317d3e19a717b237a624d067d831bc6f3ae..9c155174b081adafa07bfce77184a7141bd8a5f0 100644
(file)
--- a/
src/lib/shuffler.cc
+++ b/
src/lib/shuffler.cc
@@
-42,8
+42,11
@@
struct Comparator
void
Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
{
- /* We should only ever see 3D_LEFT / 3D_RIGHT */
- DCPOMATIC_ASSERT (video.eyes == EYES_LEFT || video.eyes == EYES_RIGHT);
+ if (video.eyes != EYES_LEFT && video.eyes != EYES_RIGHT) {
+ /* Pass through anything that we don't care about */
+ Video (weak_piece, video);
+ return;
+ }
shared_ptr<Piece> piece = weak_piece.lock ();
DCPOMATIC_ASSERT (piece);