diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-04-12 16:49:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 16:49:43 -0400 |
| commit | 6d98c0b62ad86c8708345303ecba7d7852aaf725 (patch) | |
| tree | 40f87e069c3d3f14b86b21d6fdb3889739bd3fc4 | |
| parent | 6386b9b1b99ac73056d871c3927df68989c92003 (diff) | |
| parent | 9dda2ffc919c9a645f5324f5eeea20d092eeb6c2 (diff) | |
Merge pull request #2779 from KristupasSavickas/fix-docker-arm-ffmpeg-path
Fix ffmpeg path on ARM docker image
| -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 f195c125f1..3d6023b829 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -128,6 +128,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 c5189d6aa3..39beaa4791 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -74,4 +74,4 @@ VOLUME /cache /config /media ENTRYPOINT ["./jellyfin/jellyfin", \ "--datadir", "/config", \ "--cachedir", "/cache", \ - "--ffmpeg", "/usr/lib/jellyfin-ffmpeg"] + "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"] |