X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv10.rs;h=4b75a4035e95798ce706630e7b6e97e090875edb;hb=e07387c7f125550a41faf36a509b252cf71d7f9a;hp=66e8ff1ffb7c84391bf9352914dbe7cda20dcc6f;hpb=01613464323864a655c994820d3c43df1954e3b2;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs
index 66e8ff1..4b75a40 100644
--- a/nihav-realmedia/src/codecs/rv10.rs
+++ b/nihav-realmedia/src/codecs/rv10.rs
@@ -57,7 +57,7 @@ struct RV10SliceInfo {
 
 impl RV10SliceInfo {
     fn new(is_p: bool, qscale: u8, mb_x: usize, mb_y: usize, mb_c: usize) -> Self {
-        RV10SliceInfo { is_p: is_p, qscale: qscale, mb_x: mb_x, mb_y: mb_y, mb_c: mb_c }
+        RV10SliceInfo { is_p, qscale, mb_x, mb_y, mb_c }
     }
 }
 
@@ -77,7 +77,7 @@ impl<'a> RealVideo10BR<'a> {
         let soff = nslices * 8 + 1;
         RealVideo10BR {
             br:         BitReader::new(&src[soff..], src.len() - soff, BitReaderMode::BE),
-            tables:     tables,
+            tables,
             num_slices: nslices,
             slice_no:   0,
             slice_off:  slice_offs,
@@ -85,10 +85,10 @@ impl<'a> RealVideo10BR<'a> {
             h:          height,
             mb_w:       (width  + 15) >> 4,
             mb_h:       (height + 15) >> 4,
-            new_ver:    new_ver,
+            new_ver,
             dc_coded:   [false; 3],
             last_dc:    [0; 3],
-            mvmode:     mvmode,
+            mvmode,
         }
     }
 
@@ -379,20 +379,20 @@ impl RealVideo10Decoder {
         let chroma_dc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap();
 
         let tables = Tables {
-            intra_mcbpc_cb: intra_mcbpc_cb,
-            inter_mcbpc_cb: inter_mcbpc_cb,
-            cbpy_cb:        cbpy_cb,
-            rl_cb:          rl_cb,
-            aic_rl_cb:      aic_rl_cb,
-            mv_cb:          mv_cb,
-            luma_dc_cb:     luma_dc_cb,
-            chroma_dc_cb:   chroma_dc_cb,
+            intra_mcbpc_cb,
+            inter_mcbpc_cb,
+            cbpy_cb,
+            rl_cb,
+            aic_rl_cb,
+            mv_cb,
+            luma_dc_cb,
+            chroma_dc_cb,
         };
 
         RealVideo10Decoder{
             info:           NACodecInfoRef::default(),
             dec:            H263BaseDecoder::new_with_opts(false, false, false),
-            tables:         tables,
+            tables,
             w:              0,
             h:              0,
             new_ver:        false,
@@ -452,7 +452,7 @@ println!("???");
 }
 
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
     Box::new(RealVideo10Decoder::new())
 }
 
@@ -478,7 +478,7 @@ pub struct CodeReader { codes: &'static [u16], bits: &'static [u8] }
 
 impl CodeReader {
     pub fn new(codes: &'static [u16], bits: &'static [u8]) -> Self {
-        CodeReader { codes: codes, bits: bits }
+        CodeReader { codes, bits }
     }
 }