djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #148 from jb-alvarado/master

Browse Source 
fix regex on ffmpeg filter match
This commit is contained in:
jb-alvarado 2022-07-07 17:21:28 +02:00 committed by GitHub
commit 03738079f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1009,7 +1009,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout" name = "ffplayout"
version = "0.10.2" version = "0.10.3"
dependencies = [ dependencies = [
"clap", "clap",
"crossbeam-channel 0.5.5", "crossbeam-channel 0.5.5",
@ -1056,7 +1056,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-lib" name = "ffplayout-lib"
version = "0.10.2" version = "0.10.3"
dependencies = [ dependencies = [
"chrono 0.4.20-beta.1", "chrono 0.4.20-beta.1",
"crossbeam-channel 0.5.5", "crossbeam-channel 0.5.5",

2
ffplayout-engine/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Jonathan Baecker jonbae77@gmail.com"] authors = ["Jonathan Baecker jonbae77@gmail.com"]
readme = "README.md" readme = "README.md"
version = "0.10.2" version = "0.10.3"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
lib/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Library for ffplayout"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Jonathan Baecker jonbae77@gmail.com"] authors = ["Jonathan Baecker jonbae77@gmail.com"]
readme = "README.md" readme = "README.md"
version = "0.10.2" version = "0.10.3"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
lib/src/utils/mod.rs
View File

@ -561,7 +561,7 @@ fn ffmpeg_libs_and_filter() -> (Vec<String>, Vec<String>) {
let mut filters: Vec<String> = vec![]; let mut filters: Vec<String> = vec![];
// filter lines which contains filter // filter lines which contains filter
let re: Regex = Regex::new(r"^( ?) [TSC.]+").unwrap(); let re: Regex = Regex::new(r"^ ?[TSC.]+").unwrap();
let mut ff_proc = match Command::new("ffmpeg") let mut ff_proc = match Command::new("ffmpeg")
.arg("-filters") .arg("-filters")