Merge branch 'main' of https://github.com/AlexPresso/VideoStation-FFM… · AlexPresso/VideoStation-FFMPEG-Patcher@0cdb48d · GitHub

Commit

Merge branch 'main' of https://github.com/AlexPresso/VideoStation-FFM…

Browse files

…PEG-Patcher into fix_config_and_logs

# Conflicts:
#	wrappers/ffmpeg.sh
#	wrappers/gst-inspect-1.0.sh
#	wrappers/gst-launch-1.0.sh

Loading branch information

AlexPresso committed Nov 14, 2023

2 parents bc1dda6 + 610cb3f commit 0cdb48d