Merge remote-tracking branch 'origin/main' into new_wrapper
# Conflicts: # patcher.sh
This commit is contained in:
commit
c08383ce28
@ -8,6 +8,8 @@ This patcher is designed to continue the work from this [Gist](https://gist.gith
|
||||
|
||||
Huge thanks to [Benjamin Poncet](https://github.com/BenjaminPoncet), [Vincent Fortier](https://github.com/th0ma7), [SynoCommunity](https://github.com/SynoCommunity) and all contributors.
|
||||
|
||||
### Also want to patch MediaServer ? [there you go](https://github.com/AlexPresso/mediaserver-ffmpeg-patcher)
|
||||
|
||||
## Dependencies
|
||||
- DSM 6.2.2-24922 Update 4 (and above)
|
||||
- Video Station 2.4.6-1594 (and above)
|
||||
|
@ -46,3 +46,5 @@ info "========================================[start ffmpeg $pid]"
|
||||
info "DEFAULT_ARGS: $*"
|
||||
|
||||
/var/packages/ffmpeg/target/bin/ffmpeg "$@" 2> $stderrfile
|
||||
|
||||
endprocess
|
||||
|
@ -9,7 +9,7 @@ repo_base_url="https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher"
|
||||
version="2.0"
|
||||
action="patch"
|
||||
branch="main"
|
||||
dependencies=("ffmpeg" "gstreamer")
|
||||
dependencies=("VideoStation" "ffmpeg" "gstreamer")
|
||||
wrappers=("ffmpeg" "gst-launch-1.0")
|
||||
|
||||
vs_path=/var/packages/VideoStation/target
|
||||
|
Loading…
x
Reference in New Issue
Block a user