X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=37bfa3bae5891818aa64e1fd596cc33f4ce820ef;hb=750b299cebf79e53a0ce37c59afdadec8f527c7b;hp=bde38da041d9ed39788b2717079108a24845cc25;hpb=bcfeae48693ae98aa504b86e6ced38de0573e302;p=nihav.git diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs index bde38da..37bfa3b 100644 --- a/src/demuxers/avi.rs +++ b/src/demuxers/avi.rs @@ -1,8 +1,8 @@ use super::*; use register; use super::DemuxerError::*; -use io::byteio::*; -use frame::*; +//use io::byteio::*; +//use frame::*; use formats::*; macro_rules! mktag { @@ -39,7 +39,6 @@ impl StreamState { #[allow(dead_code)] struct AVIDemuxer<'a> { - opened: bool, src: &'a mut ByteReader<'a>, cur_frame: Vec, num_streams: u8, @@ -65,12 +64,10 @@ impl<'a> DemuxCore<'a> for AVIDemuxer<'a> { #[allow(unused_variables)] fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> { self.read_header(strmgr)?; - self.opened = true; Ok(()) } fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { - if !self.opened { return Err(NoSuchInput); } if self.movi_size == 0 { return Err(EOF); } let mut tag: [u8; 4] = [0; 4]; loop { @@ -117,7 +114,6 @@ impl<'a> DemuxCore<'a> for AVIDemuxer<'a> { #[allow(unused_variables)] fn seek(&mut self, time: u64) -> DemuxerResult<()> { - if !self.opened { return Err(NoSuchInput); } Err(NotImplemented) } } @@ -127,7 +123,6 @@ impl<'a> AVIDemuxer<'a> { AVIDemuxer { cur_frame: Vec::new(), num_streams: 0, - opened: false, src: io, size: 0, movi_size: 0,