mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Merge pull request #2287 from nyanmisaka/master
New upstream ffmpeg version 4.2.1 for windows nightly channel
This commit is contained in:
commit
bc4c67e6fa
3 changed files with 6 additions and 5 deletions
|
@ -8,7 +8,7 @@ set -o xtrace
|
||||||
# Version variables
|
# Version variables
|
||||||
NSSM_VERSION="nssm-2.24-101-g897c7ad"
|
NSSM_VERSION="nssm-2.24-101-g897c7ad"
|
||||||
NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip"
|
NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip"
|
||||||
FFMPEG_VERSION="ffmpeg-4.0.2-win64-static"
|
FFMPEG_VERSION="ffmpeg-4.2.1-win64-static"
|
||||||
FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win64/static/${FFMPEG_VERSION}.zip"
|
FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win64/static/${FFMPEG_VERSION}.zip"
|
||||||
|
|
||||||
# Move to source directory
|
# Move to source directory
|
||||||
|
|
|
@ -8,7 +8,7 @@ set -o xtrace
|
||||||
# Version variables
|
# Version variables
|
||||||
NSSM_VERSION="nssm-2.24-101-g897c7ad"
|
NSSM_VERSION="nssm-2.24-101-g897c7ad"
|
||||||
NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip"
|
NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip"
|
||||||
FFMPEG_VERSION="ffmpeg-4.0.2-win32-static"
|
FFMPEG_VERSION="ffmpeg-4.2.1-win32-static"
|
||||||
FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win32/static/${FFMPEG_VERSION}.zip"
|
FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win32/static/${FFMPEG_VERSION}.zip"
|
||||||
|
|
||||||
# Move to source directory
|
# Move to source directory
|
||||||
|
|
|
@ -46,7 +46,8 @@ function Build-JellyFin {
|
||||||
function Install-FFMPEG {
|
function Install-FFMPEG {
|
||||||
param(
|
param(
|
||||||
[string]$ResolvedInstallLocation,
|
[string]$ResolvedInstallLocation,
|
||||||
[string]$Architecture
|
[string]$Architecture,
|
||||||
|
[string]$FFMPEGVersionX86 = "ffmpeg-4.2.1-win32-shared"
|
||||||
)
|
)
|
||||||
Write-Verbose "Checking Architecture"
|
Write-Verbose "Checking Architecture"
|
||||||
if($Architecture -notin @('x86','x64')){
|
if($Architecture -notin @('x86','x64')){
|
||||||
|
@ -57,7 +58,7 @@ function Install-FFMPEG {
|
||||||
Invoke-WebRequest -Uri https://repo.jellyfin.org/releases/server/windows/ffmpeg/jellyfin-ffmpeg.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{
|
}else{
|
||||||
Write-Verbose "Downloading 32 bit FFMPEG"
|
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
|
Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/shared/$FFMPEGVersionX86.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
|
||||||
}
|
}
|
||||||
|
|
||||||
Expand-Archive "$tempdir/ffmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" -Force | Write-Verbose
|
Expand-Archive "$tempdir/ffmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" -Force | Write-Verbose
|
||||||
|
@ -68,7 +69,7 @@ function Install-FFMPEG {
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
Write-Verbose "Copying Binaries to Jellyfin location"
|
Write-Verbose "Copying Binaries to Jellyfin location"
|
||||||
Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.0.2-win32-shared/bin" | ForEach-Object {
|
Get-ChildItem "$tempdir/ffmpeg/$FFMPEGVersionX86/bin" | ForEach-Object {
|
||||||
Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
|
Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue