X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fmod.rs;h=3ecc983f7a75482a2bf16393a918bc2ee9f0a58a;hb=a1f26d1be2a62dfe4db26e9a5faaf9199f6b0325;hp=dad92469901247191730a542c1cf734284692cd9;hpb=ce52b3b5f57c73d8d55373e635c383f4403e04a7;p=nihav.git diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs index dad9246..3ecc983 100644 --- a/src/demuxers/mod.rs +++ b/src/demuxers/mod.rs @@ -11,6 +11,7 @@ pub enum DemuxerError { IOError, NotImplemented, MemoryError, + TryAgain, } type DemuxerResult = Result; @@ -38,7 +39,7 @@ impl<'a> NAPacketReader for ByteReader<'a> { } fn fill_packet(&mut self, pkt: &mut NAPacket) -> DemuxerResult<()> { let mut refbuf = pkt.get_buffer(); - let mut buf = Rc::make_mut(&mut refbuf); + let buf = Rc::make_mut(&mut refbuf); let res = self.read_buf(buf.as_mut_slice()); if let Err(_) = res { return Err(DemuxerError::IOError); } Ok(()) @@ -200,7 +201,7 @@ pub trait DemuxerCreator { } macro_rules! validate { - ($a:expr) => { if !$a { return Err(DemuxerError::InvalidData); } }; + ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; } #[cfg(feature="demuxer_gdv")]