From cf649af44356724eee5ada99e30e29f11519ddd6 Mon Sep 17 00:00:00 2001 From: Alex <15526962+AlexPresso@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:36:45 +0200 Subject: [PATCH 1/2] Fix err code (#106) * Fix multy-try errcode --- motd.txt | 4 ++-- wrappers/ffmpeg.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/motd.txt b/motd.txt index c0808c4..37c7552 100644 --- a/motd.txt +++ b/motd.txt @@ -1,4 +1,4 @@ -A new version of the wrapper was deployed (v2.5) fixing some issues with hardware transcoding. -You can find the changelog here: https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/releases/tag/2.5 +A new version of the wrapper was deployed (v2.6) fixing an issue with offline transcoding. +You can find the changelog here: https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/releases/tag/2.6 As always, please let me know of any issue you could have. diff --git a/wrappers/ffmpeg.sh b/wrappers/ffmpeg.sh index a54958e..6a298c4 100644 --- a/wrappers/ffmpeg.sh +++ b/wrappers/ffmpeg.sh @@ -122,6 +122,7 @@ if [[ $errcode -eq 0 ]]; then endprocess fi +errcode=0 info "Trying with VideoStation's ffmpeg with default args..." /var/packages/VideoStation/target/bin/ffmpeg.orig "$@" <&0 2>> $stderrfile & child=$! @@ -131,6 +132,7 @@ if [[ $errcode -eq 0 ]]; then endprocess fi +errcode=0 info "Trying with SC's ffmpeg and fixed args..." "/var/packages/${ffmpeg_version}/target/bin/ffmpeg" "${args[@]}" <&0 2>> $stderrfile & child=$! From b299898bbb6cb744330d0a052f34f4f16dff88d8 Mon Sep 17 00:00:00 2001 From: Alex <15526962+AlexPresso@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:44:54 +0200 Subject: [PATCH 2/2] Update README.md (#107) * Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 3195bd1..669934e 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ Huge thanks to [Benjamin Poncet](https://github.com/BenjaminPoncet), [Vincent Fo - Note : Basic command uses **ffmpeg4** by default, if you want to use a different ffmpeg version (i.e. **ffmpeg5** or **ffmpeg6**), please check the command [flags](https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher#usage). - You'll have to re-run the patcher everytime you update VideoStation, Advanced Media Extensions and DSM +## Update procedure +To update the wrapper, just unpatch and repatch using the following commands: +- Unpatch: `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash -s -- -a unpatch` +- Patch: `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash` + ## Usage Basic command: `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash`