summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-07 22:34:07 +0100
committerCarl Hetherington <cth@carlh.net>2018-04-07 22:34:07 +0100
commit90f6aaa11d0281772e4f9e164f211e3f2c03af7a (patch)
tree2346a7ac80077877590585e27f8f19315335dd59
parent6e6ebf3122333b38333482bce64df3e6e61e64c4 (diff)
Somewhat speculative shuffler fix for assertion failure.v2.13.13
-rw-r--r--src/lib/shuffler.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 59656317d..9c155174b 100644
--- 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);