diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-10-06 19:23:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-06 19:23:01 -0400 |
| commit | d8c3b26fa686e440912a45d82bb9866b4b66822c (patch) | |
| tree | 2f5f5707af33fb9a30fed5ec9b8c1d664297df33 | |
| parent | f1567c64a542d419cf4dd0be881d3f75fca9bd85 (diff) | |
| parent | adde41c53377ab57c47fbb8afedd0888a437cc1e (diff) | |
Merge pull request #1846 from jellyfin/EraYaN-patch-1v10.4.0
Switch to custom patched build for ffmpeg for the Windows installer
| -rw-r--r-- | deployment/windows/build-jellyfin.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deployment/windows/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1 index 454c89bf6..c4fb4b995 100644 --- a/deployment/windows/build-jellyfin.ps1 +++ b/deployment/windows/build-jellyfin.ps1 @@ -51,7 +51,7 @@ function Install-FFMPEG { Write-Warning "FFMPEG will not be installed" }elseif($Architecture -eq 'x64'){ Write-Verbose "Downloading 64 bit FFMPEG" - Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.0.2-win64-shared.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose + Invoke-WebRequest -Uri https://repo.jellyfin.org/releases/server/windows/ffmpeg/jellyfin-ffmpeg.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose }else{ Write-Verbose "Downloading 32 bit FFMPEG" Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.0.2-win32-shared.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose @@ -60,7 +60,7 @@ function Install-FFMPEG { Expand-Archive "$tempdir/ffmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" -Force | Write-Verbose if($Architecture -eq 'x64'){ Write-Verbose "Copying Binaries to Jellyfin location" - Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.0.2-win64-shared/bin" | ForEach-Object { + Get-ChildItem "$tempdir/ffmpeg" | ForEach-Object { Copy-Item $_.FullName -Destination $installLocation | Write-Verbose } }else{ |