mkv: use

pdeljanov · Jan 28, 2022 · 2b7533a · 2b7533a
1 parent acd4d94
commit 2b7533a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/symphonia-format-mkv/src/demuxer.rs b/symphonia-format-mkv/src/demuxer.rs
@@ -11,7 +11,7 @@ use std::io::{Seek, SeekFrom};
 
 use symphonia_core::audio::Layout;
 use symphonia_core::codecs::{CODEC_TYPE_FLAC, CODEC_TYPE_VORBIS, CodecParameters};
-use symphonia_core::errors::{decode_error, Error, Result, seek_error, SeekErrorKind, unsupported_error};
+use symphonia_core::errors::{decode_error, end_of_stream_error, Error, Result, seek_error, SeekErrorKind, unsupported_error};
 use symphonia_core::formats::{Cue, FormatOptions, FormatReader, Packet, SeekedTo, SeekMode, SeekTo, Track};
 use symphonia_core::io::{BufReader, MediaSource, MediaSourceStream, ReadBytes};
 use symphonia_core::meta::{Metadata, MetadataLog};
@@ -203,8 +203,7 @@ impl MkvReader {
             Some(header) => header,
             None => {
                 // If we reached here, it must be an end of stream.
-                self.iter.assert_end_of_stream()?;
-                unreachable!();
+                return end_of_stream_error();
             }
         };
 

diff --git a/symphonia-format-mkv/src/ebml.rs b/symphonia-format-mkv/src/ebml.rs
@@ -477,12 +477,6 @@ impl<R: ReadBytes> ElementIterator<R> {
         Ok(())
     }
 
-    /// Returns an `end of stream` IoError.
-    pub(crate) fn assert_end_of_stream(&mut self) -> Result<()> {
-        self.reader.ignore_bytes(u64::MAX)?;
-        Ok(())
-    }
-
     /// Gets the position of the underlying stream.
     pub(crate) fn pos(&self) -> u64 {
         self.reader.pos()