From 45a1ac348e2ca9cd4e05ee33d88e4dafc5336126 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Fri, 26 Jan 2024 04:35:33 +0100
Subject: oops. broke non-subtitle streams

---
 remuxer/src/segment_extractor.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'remuxer/src/segment_extractor.rs')

diff --git a/remuxer/src/segment_extractor.rs b/remuxer/src/segment_extractor.rs
index d176b3a..89d5784 100644
--- a/remuxer/src/segment_extractor.rs
+++ b/remuxer/src/segment_extractor.rs
@@ -31,9 +31,13 @@ impl<'a> SegmentExtractIter<'a> {
                 MatroskaTag::Timestamp(_) => (),
                 MatroskaTag::BlockGroup(Master::Start) => group = true,
                 MatroskaTag::BlockGroup(Master::End) => {
-                    assert!(group, "group end without start");
-                    let block = saved_block.expect("blockgroup without any block");
-                    return Ok((block, duration));
+                    if !group {
+                        bail!("group end without start");
+                    }
+                    if let Some(block) = saved_block {
+                        return Ok((block, duration));
+                    }
+                    group = false;
                 }
                 MatroskaTag::BlockDuration(d) => duration = Some(d),
                 MatroskaTag::SimpleBlock(buf) | MatroskaTag::Block(buf) => {
-- 
cgit v1.2.3-70-g09d2