rename "str" variable to avoid confusion with the primitive type

[nihav.git] / nihav-realmedia / src / codecs / rv60.rs

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 5748cde771b5ce2375e5176a3bf36a6a55e8b9ba..844e1abf611dcff59d8f1a84398c198300c7b37a 100644 (file)
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -595,11 +595,11 @@ impl DeblockInfo {
     fn get_left_strength(&self, pos: usize) -> u8 {
         self.left_str[pos] & 3
     }
-    fn set_top_strength(&mut self, pos: usize, str: u8) {
-        self.top_str[pos] |= str;
+    fn set_top_strength(&mut self, pos: usize, strength: u8) {
+        self.top_str[pos] |= strength;
     }
-    fn set_left_strength(&mut self, pos: usize, str: u8) {
-        self.left_str[pos] |= str;
+    fn set_left_strength(&mut self, pos: usize, strength: u8) {
+        self.left_str[pos] |= strength;
     }
 }
 
@@ -1552,8 +1552,8 @@ impl NAOptionHandler for RealVideo60Decoder {
             for opt_def in DECODER_OPTIONS.iter() {
                 if opt_def.check(option).is_ok() {
                     match (option.name, &option.value) {
-                        (FRAME_SKIP_OPTION, NAValue::String(ref str)) => {
-                            if let Ok(smode) = FrameSkipMode::from_str(str) {
+                        (FRAME_SKIP_OPTION, NAValue::String(ref strval)) => {
+                            if let Ok(smode) = FrameSkipMode::from_str(strval) {
                                 self.skip_mode = smode;
                             }
                         },