diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e490538..6755fce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ changes, see Git history. Each release is tagged in Git and on the Docker repository [`scottlamb/moonfire-nvr`](https://hub.docker.com/r/scottlamb/moonfire-nvr). +## `v0.6.3` (in progress) + +* Compile fix for nightly rust 2021-03-14 and beyond. + ## `v0.6.2` * Fix panics when a stream's PTS has extreme jumps diff --git a/server/Cargo.lock b/server/Cargo.lock index 173fd409..d31f0559 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1629,12 +1629,12 @@ dependencies = [ [[package]] name = "protobuf" version = "3.0.0-pre" -source = "git+/~https://github.com/stepancheg/rust-protobuf#5f3ed259acf9ae42014e4e49f7c4d62917685584" +source = "git+/~https://github.com/stepancheg/rust-protobuf#c27743ae4ce421f5d9a61ef0d1885eface278d6c" [[package]] name = "protobuf-codegen" version = "3.0.0-pre" -source = "git+/~https://github.com/stepancheg/rust-protobuf#5f3ed259acf9ae42014e4e49f7c4d62917685584" +source = "git+/~https://github.com/stepancheg/rust-protobuf#c27743ae4ce421f5d9a61ef0d1885eface278d6c" dependencies = [ "protobuf", ] @@ -1642,7 +1642,7 @@ dependencies = [ [[package]] name = "protobuf-codegen-pure" version = "3.0.0-pre" -source = "git+/~https://github.com/stepancheg/rust-protobuf#5f3ed259acf9ae42014e4e49f7c4d62917685584" +source = "git+/~https://github.com/stepancheg/rust-protobuf#c27743ae4ce421f5d9a61ef0d1885eface278d6c" dependencies = [ "protobuf", "protobuf-codegen", diff --git a/server/src/mp4.rs b/server/src/mp4.rs index 077822d9..2687d0b9 100644 --- a/server/src/mp4.rs +++ b/server/src/mp4.rs @@ -1336,7 +1336,7 @@ impl FileBuilder { struct Entry { segment_duration: u64, media_time: u64, - }; + } let mut flushed: Vec = Vec::new(); let mut unflushed: Entry = Default::default(); let mut cur_media_time: u64 = 0;