fix clippy warnings

[nihav.git] / nihav-commonfmt / src / codecs / clearvideo.rs

diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs
index 731f8485213a3a16ce99edf92b813b2e9e73b4b3..50794aba7ab783b4cd2711bd219b0d671e92ec1a 100644 (file)
--- a/nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/nihav-commonfmt/src/codecs/clearvideo.rs
@@ -572,7 +572,7 @@ fn decode_dct_block(br: &mut BitReader, blk: &mut [i32; 64], ac_quant: i32, has_
             } else {
                 eob = br.read_bool()?;
                 let run = br.read(6)? as usize;
-                let lev = br.read_s(8)? as i32;
+                let lev = br.read_s(8)?;
                 (lev, run)
             };
         idx += skip;
@@ -881,7 +881,10 @@ impl NADecoder for ClearVideoDecoder {
     #[allow(clippy::or_fun_call)]
     fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
-            let w = vinfo.get_width();
+            let mut w = vinfo.get_width();
+            if self.is_rm {
+                w = (w + 0x1F) & !0x1F;
+            }
             let h = vinfo.get_height();
             let f = vinfo.is_flipped();
             let fmt = formats::YUV420_FORMAT;