Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #991 from joshuaboniface/ffmpeg-compat

Browse Source 
Fix the ffmpeg compatibility
This commit is contained in:
Andrew Rabert 2019-02-27 20:45:43 -05:00 committed by GitHub
commit f384822aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/debian-package-x64/pkg-src/conf/jellyfin
View File

@ -21,9 +21,9 @@ JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin"
# Restart script for in-app server control # Restart script for in-app server control
JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh" JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"
# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values # ffmpeg binary paths, overriding the system values
#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg" JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/share/jellyfin-ffmpeg/ffmpeg"
#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe" JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/share/jellyfin-ffmpeg/ffprobe"
# [OPTIONAL] run Jellyfin as a headless service # [OPTIONAL] run Jellyfin as a headless service
#JELLYFIN_SERVICE_OPT="--service" #JELLYFIN_SERVICE_OPT="--service"

2
deployment/debian-package-x64/pkg-src/control
View File

@ -20,7 +20,7 @@ Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
Architecture: any Architecture: any
Depends: at, Depends: at,
libsqlite3-0, libsqlite3-0,
ffmpeg (<7:4.1) | jellyfin-ffmpeg, jellyfin-ffmpeg,
libfontconfig1, libfontconfig1,
libfreetype6, libfreetype6,
libssl1.0.0 | libssl1.0.2 libssl1.0.0 | libssl1.0.2