diff --git a/Cargo.lock b/Cargo.lock index ecaa9b5d..96ae70e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ffplayout" -version = "0.15.1" +version = "0.15.2" dependencies = [ "chrono", "clap", @@ -960,7 +960,7 @@ dependencies = [ [[package]] name = "ffplayout-api" -version = "0.6.1" +version = "0.6.2" dependencies = [ "actix-files", "actix-multipart", @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "ffplayout-lib" -version = "0.15.1" +version = "0.15.2" dependencies = [ "chrono", "crossbeam-channel", diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index f6887174..4b770827 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -4,7 +4,7 @@ description = "Rest API for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.6.1" +version = "0.6.2" edition = "2021" [dependencies] diff --git a/ffplayout-engine/Cargo.toml b/ffplayout-engine/Cargo.toml index 5c9826c8..baa45227 100644 --- a/ffplayout-engine/Cargo.toml +++ b/ffplayout-engine/Cargo.toml @@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.15.1" +version = "0.15.2" edition = "2021" [dependencies] diff --git a/ffplayout-frontend b/ffplayout-frontend index 3512dec8..51719eb9 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 3512dec8f117dce1bad4f82461de21e37e01d770 +Subproject commit 51719eb9c03d26da8ffac6a677d1c41b756bdf83 diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 2f9e38a7..a8ae099c 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -4,7 +4,7 @@ description = "Library for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.15.1" +version = "0.15.2" edition = "2021" [dependencies] diff --git a/lib/src/utils/mod.rs b/lib/src/utils/mod.rs index 11746206..af5a71a8 100644 --- a/lib/src/utils/mod.rs +++ b/lib/src/utils/mod.rs @@ -647,7 +647,7 @@ pub fn include_file(config: PlayoutConfig, file_path: &Path) -> bool { .out .output_cmd .clone() - .unwrap() + .unwrap_or_else(|| vec![String::new()]) .iter() .find(|s| s.contains(".ts")) { @@ -661,7 +661,7 @@ pub fn include_file(config: PlayoutConfig, file_path: &Path) -> bool { if let Some(m3u8_path) = config .out .output_cmd - .unwrap() + .unwrap_or_else(|| vec![String::new()]) .iter() .find(|s| s.contains(".m3u8") && !s.contains("master.m3u8")) {