From 48ba5a9a302d43d64b40ea4a1561fea3a3b602f8 Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Sun, 12 Apr 2020 16:49:43 -0400 Subject: [PATCH] Merge pull request #2779 from KristupasSavickas/fix-docker-arm-ffmpeg-path Fix ffmpeg path on ARM docker image (cherry picked from commit 6d98c0b62ad86c8708345303ecba7d7852aaf725) Signed-off-by: Joshua M. Boniface --- CONTRIBUTORS.md | 1 + Dockerfile.arm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4f36249655..3344244ef3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -127,6 +127,7 @@ - [xosdy](https://github.com/xosdy) - [XVicarious](https://github.com/XVicarious) - [YouKnowBlom](https://github.com/YouKnowBlom) + - [KristupasSavickas](https://github.com/KristupasSavickas) # Emby Contributors diff --git a/Dockerfile.arm b/Dockerfile.arm index 8a562c6edf..e2c522ee15 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -70,4 +70,4 @@ VOLUME /cache /config /media ENTRYPOINT ["./jellyfin/jellyfin", \ "--datadir", "/config", \ "--cachedir", "/cache", \ - "--ffmpeg", "/usr/lib/jellyfin-ffmpeg"] + "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"]