X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fdemuxers%2Fivf.rs;fp=nihav-indeo%2Fsrc%2Fdemuxers%2Fivf.rs;h=4e55d914f21d1966b65453a559ecc21b95503cc2;hp=cccb5ab71dfea36a7a1410ce68ecb06851fbec78;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hpb=625751036014b099fd9c126397bc973cb0543130 diff --git a/nihav-indeo/src/demuxers/ivf.rs b/nihav-indeo/src/demuxers/ivf.rs index cccb5ab..4e55d91 100644 --- a/nihav-indeo/src/demuxers/ivf.rs +++ b/nihav-indeo/src/demuxers/ivf.rs @@ -40,9 +40,9 @@ impl<'a> DemuxCore<'a> for IVFDemuxer<'a> { fn open(&mut self, strmgr: &mut StreamManager, _seek_index: &mut SeekIndex) -> DemuxerResult<()> { let mut guid = [0; 16]; self.src.read_buf(&mut guid)?; - let version = match &guid { - &IVF_GUID_0 => 0, - &IVF_GUID_1 => 1, + let version = match guid { + IVF_GUID_0 => 0, + IVF_GUID_1 => 1, _ => return Err(DemuxerError::InvalidData), }; let flags = self.src.read_u32le()?; @@ -85,7 +85,7 @@ impl<'a> DemuxCore<'a> for IVFDemuxer<'a> { let fcc = self.src.read_tag()?; self.src.read_skip(20)?; - let mut vhdr = NAVideoInfo::new(width, height.abs() as usize, height < 0, YUV420_FORMAT); + let mut vhdr = NAVideoInfo::new(width, height.unsigned_abs() as usize, height < 0, YUV420_FORMAT); vhdr.bits = (planes as u8) * (bitcount as u8); let cname = match &fcc { b"IV31" | b"IV32" => "indeo3", @@ -243,6 +243,7 @@ const DEMUXER_OPTS: &[NAOptionDefinition] = &[ impl<'a> NAOptionHandler for IVFDemuxer<'a> { fn get_supported_options(&self) -> &[NAOptionDefinition] { DEMUXER_OPTS } + #[allow(clippy::single_match)] fn set_options(&mut self, options: &[NAOption]) { for option in options.iter() { for opt_def in DEMUXER_OPTS.iter() { @@ -259,6 +260,7 @@ impl<'a> NAOptionHandler for IVFDemuxer<'a> { } } } + #[allow(clippy::single_match)] fn query_option_value(&self, name: &str) -> Option { match name { PASSES => Some(NAValue::Int(i64::from(self.passes))),