From d3fa6b428a9a2220856d9a91266c1b6c7833093e Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Fri, 17 Jul 2020 14:37:29 +0800
Subject: [PATCH 1/3] bump the minimum required jellyfin-ffmpeg ver to 4.3.1-1

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 896d8286b7..4dc766b913 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
 Architecture: any
 Depends: at,
          libsqlite3-0,
-         jellyfin-ffmpeg (>= 4.2.1-2),
+         jellyfin-ffmpeg (>= 4.3.1-1),
          libfontconfig1,
          libfreetype6,
          libssl1.1

From cd714a724deab1e055d03b5923e7cf819c8ae805 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Fri, 17 Jul 2020 14:40:27 +0800
Subject: [PATCH 2/3] utilize jellyfin-ffmpeg for portable x64

---
 deployment/build.windows.amd64 | 10 ++++------
 windows/build-jellyfin.ps1     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/deployment/build.windows.amd64 b/deployment/build.windows.amd64
index aae061e9d6..bd5dc64381 100755
--- a/deployment/build.windows.amd64
+++ b/deployment/build.windows.amd64
@@ -8,8 +8,7 @@ set -o xtrace
 # Version variables
 NSSM_VERSION="nssm-2.24-101-g897c7ad"
 NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip"
-FFMPEG_VERSION="ffmpeg-4.3-win64-static"
-FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win64/static/${FFMPEG_VERSION}.zip"
+FFMPEG_URL="https://repo.jellyfin.org/releases/server/windows/ffmpeg/jellyfin-ffmpeg.zip";
 
 # Move to source directory
 pushd ${SOURCE_DIR}
@@ -29,12 +28,11 @@ dotnet publish Jellyfin.Server --configuration Release --self-contained --runtim
 # Prepare addins
 addin_build_dir="$( mktemp -d )"
 wget ${NSSM_URL} -O ${addin_build_dir}/nssm.zip
-wget ${FFMPEG_URL} -O ${addin_build_dir}/ffmpeg.zip
+wget ${FFMPEG_URL} -O ${addin_build_dir}/jellyfin-ffmpeg.zip
 unzip ${addin_build_dir}/nssm.zip -d ${addin_build_dir}
 cp ${addin_build_dir}/${NSSM_VERSION}/win64/nssm.exe ${output_dir}/nssm.exe
-unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir}
-cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe ${output_dir}/ffmpeg.exe
-cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe ${output_dir}/ffprobe.exe
+unzip ${addin_build_dir}/jellyfin-ffmpeg.zip -d ${addin_build_dir}/jellyfin-ffmpeg
+cp ${addin_build_dir}/jellyfin-ffmpeg/* ${output_dir}
 rm -rf ${addin_build_dir}
 
 # Prepare scripts
diff --git a/windows/build-jellyfin.ps1 b/windows/build-jellyfin.ps1
index c762137a75..b76a8e0bbe 100644
--- a/windows/build-jellyfin.ps1
+++ b/windows/build-jellyfin.ps1
@@ -47,7 +47,7 @@ function Install-FFMPEG {
     param(
         [string]$ResolvedInstallLocation,
         [string]$Architecture,
-        [string]$FFMPEGVersionX86 = "ffmpeg-4.2.1-win32-shared"
+        [string]$FFMPEGVersionX86 = "ffmpeg-4.3-win32-shared"
     )
     Write-Verbose "Checking Architecture"
     if($Architecture -notin @('x86','x64')){

From a5b673d542fd91dd445c325fabcf5b96f45dbe17 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 19 Jul 2020 17:06:58 -0400
Subject: [PATCH 3/3] Revert "bump the minimum required jellyfin-ffmpeg ver to
 4.3.1-1"

This reverts commit d3fa6b428a9a2220856d9a91266c1b6c7833093e.

Don't change this, since 4.3.1 won't build on Stretch but we still want
to support it.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 4dc766b913..896d8286b7 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
 Architecture: any
 Depends: at,
          libsqlite3-0,
-         jellyfin-ffmpeg (>= 4.3.1-1),
+         jellyfin-ffmpeg (>= 4.2.1-2),
          libfontconfig1,
          libfreetype6,
          libssl1.1