diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-04-12 16:49:43 -0400 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2020-04-12 16:50:27 -0400 |
| commit | 48ba5a9a302d43d64b40ea4a1561fea3a3b602f8 (patch) | |
| tree | ffffdbdbc4f7903aad9b18bb73a640f22dee21ac | |
| parent | dd13f8d16a2a4a0b8405f70cc067dfe7142374f1 (diff) | |
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 <joshua@boniface.me>
| -rw-r--r-- | CONTRIBUTORS.md | 1 | ||||
| -rw-r--r-- | Dockerfile.arm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4f3624965..3344244ef 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 8a562c6ed..e2c522ee1 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"] |