make libx264 optional

This commit is contained in:
jb-alvarado 2022-12-19 12:32:07 +01:00
parent 8ac3688d2b
commit 1491f46e3d

View File

@ -772,7 +772,14 @@ pub fn validate_ffmpeg(config: &mut PlayoutConfig) -> Result<(), String> {
ffmpeg_filter_and_libs(config)?;
if !config.general.ffmpeg_libs.contains(&"libx264".to_string()) {
if config
.out
.output_cmd
.as_ref()
.unwrap()
.contains(&"libx264".to_string())
&& !config.general.ffmpeg_libs.contains(&"libx264".to_string())
{
return Err("ffmpeg contains no libx264!".to_string());
}
@ -797,7 +804,7 @@ pub fn validate_ffmpeg(config: &mut PlayoutConfig) -> Result<(), String> {
.ffmpeg_libs
.contains(&"libfdk-aac".to_string())
{
error!("ffmpeg contains no libfdk-aac!");
return Err("ffmpeg contains no libfdk-aac!".to_string());
}
Ok(())