From 14dd11a2e67f9822cf37db79da53aab2737f950a Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sun, 22 Dec 2019 15:56:54 +0100
Subject: [PATCH] Add instructions for ffmpeg to the server README
---
server/README.md | 1 +
server/src/assembly/ffmpeg.txt | 10 ++++++++++
server/src/assembly/server.xml | 4 ++++
3 files changed, 15 insertions(+)
create mode 100644 server/src/assembly/ffmpeg.txt
diff --git a/server/README.md b/server/README.md
index 1d9e724c..7863439f 100644
--- a/server/README.md
+++ b/server/README.md
@@ -4,6 +4,7 @@ This is the server part, which is only needed, if you want to run ctbrec in clie
## Requirements
* Java 1.8 (32-bit or 64-bit)
+* FFmpeg (see ffmpeg/ffmpeg.txt for more details)
## Installation
* Unpack the zip-File
diff --git a/server/src/assembly/ffmpeg.txt b/server/src/assembly/ffmpeg.txt
new file mode 100644
index 00000000..8607375a
--- /dev/null
+++ b/server/src/assembly/ffmpeg.txt
@@ -0,0 +1,10 @@
+Put your statically linked FFmpeg binary here!
+
+For the different platforms copy the following file to this directory;
+Windows: ffmpeg-x.x.x-win64-static\bin\ffmpeg.exe
+Linux: ffmpeg-release-amd64-static/ffmpeg (you can also create a symlink, if FFmpeg is installed already)
+macOS: ffmpeg-x.x.x-macos64-static/bin/ffmpeg
+
+You can download FFmpeg for different platforms here. Make sure to choose the statically linked version: https://ffmpeg.org/download.html
+
+Tested with FFmpeg 4.2.1
\ No newline at end of file
diff --git a/server/src/assembly/server.xml b/server/src/assembly/server.xml
index 331fb90d..c98bab9a 100644
--- a/server/src/assembly/server.xml
+++ b/server/src/assembly/server.xml
@@ -29,6 +29,10 @@
${project.basedir}/README.mdctbrec
+
+ ${project.basedir}/src/assembly/ffmpeg.txt
+ ctbrec/ffmpeg
+ ${project.build.directory}/${name.final}.jarctbrec