diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-02-27 20:45:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 20:45:43 -0500 |
| commit | f384822aa539e0a86c5d3714b74c68549862745b (patch) | |
| tree | b3ceec758ac59585949949e9bf516a346a5a4068 | |
| parent | 8e5cccb22c513d202fc07c5fe8c776c9a50191e7 (diff) | |
| parent | 5054a77dcf73f829178009c73fef7b96de644607 (diff) | |
Merge pull request #991 from joshuaboniface/ffmpeg-compat
Fix the ffmpeg compatibility
| -rw-r--r-- | deployment/debian-package-x64/pkg-src/conf/jellyfin | 6 | ||||
| -rw-r--r-- | deployment/debian-package-x64/pkg-src/control | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deployment/debian-package-x64/pkg-src/conf/jellyfin b/deployment/debian-package-x64/pkg-src/conf/jellyfin index b052b2ec6..58fe79332 100644 --- a/deployment/debian-package-x64/pkg-src/conf/jellyfin +++ b/deployment/debian-package-x64/pkg-src/conf/jellyfin @@ -21,9 +21,9 @@ JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin" # Restart script for in-app server control JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh" -# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values -#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg" -#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe" +# ffmpeg binary paths, overriding the system values +JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/share/jellyfin-ffmpeg/ffmpeg" +JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/share/jellyfin-ffmpeg/ffprobe" # [OPTIONAL] run Jellyfin as a headless service #JELLYFIN_SERVICE_OPT="--service" diff --git a/deployment/debian-package-x64/pkg-src/control b/deployment/debian-package-x64/pkg-src/control index 88d10438b..d96660590 100644 --- a/deployment/debian-package-x64/pkg-src/control +++ b/deployment/debian-package-x64/pkg-src/control @@ -20,7 +20,7 @@ Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Architecture: any Depends: at, libsqlite3-0, - ffmpeg (<7:4.1) | jellyfin-ffmpeg, + jellyfin-ffmpeg, libfontconfig1, libfreetype6, libssl1.0.0 | libssl1.0.2 |