projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clippy warnings for update to rustc 1.46
[nihav.git]
/
nihav-realmedia
/
src
/
demuxers
/
realmedia.rs
diff --git
a/nihav-realmedia/src/demuxers/realmedia.rs
b/nihav-realmedia/src/demuxers/realmedia.rs
index 74581d934c93774385b144637e03009753d9e6b7..248fa6c6f4c8677c594824fbe706cf0afc8a9518 100644
(file)
--- a/
nihav-realmedia/src/demuxers/realmedia.rs
+++ b/
nihav-realmedia/src/demuxers/realmedia.rs
@@
-1185,8
+1185,8
@@
fn read_string_size(src: &mut ByteReader, size: usize) -> DemuxerResult<String>
vec.push(c);
}
let str = String::from_utf8(vec);
vec.push(c);
}
let str = String::from_utf8(vec);
- if
str.is_ok()
{
- Ok(
str.unwrap()
)
+ if
let Ok(res) = str
{
+ Ok(
res
)
} else {
Ok(String::new())
}
} else {
Ok(String::new())
}
@@
-1653,7
+1653,7
@@
impl<'a> RealIVRDemuxer<'a> {
}
}
}
}
-static RM_VIDEO_CODEC_REGISTER: &
'static
[(&[u8;4], &str)] = &[
+static RM_VIDEO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
(b"RV10", "realvideo1"),
(b"RV20", "realvideo2"),
(b"RVTR", "realvideo2"),
(b"RV10", "realvideo1"),
(b"RV20", "realvideo2"),
(b"RVTR", "realvideo2"),
@@
-1663,7
+1663,7
@@
static RM_VIDEO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
(b"CLV1", "clearvideo_rm"),
];
(b"CLV1", "clearvideo_rm"),
];
-static RM_AUDIO_CODEC_REGISTER: &
'static
[(&[u8;4], &str)] = &[
+static RM_AUDIO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
(b"lpcJ", "ra14.4"),
(b"28_8", "ra28.8"),
(b"cook", "cook"),
(b"lpcJ", "ra14.4"),
(b"28_8", "ra28.8"),
(b"cook", "cook"),