Recompile FFmpeg with Ubuntu 14.04

This is required since Travis CI uses this version of Ubuntu.
scp-fs2open · Jul 31, 2018 · f66f00c · f66f00c
1 parent 536f757
commit f66f00c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 1 deletion.
diff --git a/doc/FFmpeg.md b/doc/FFmpeg.md
@@ -10,4 +10,6 @@ The linux builds were compiled with the following configure line:
 
     ./configure --disable-programs --disable-doc --disable-avdevice --disable-postproc --disable-avfilter --disable-network --disable-encoders --disable-hwaccels --disable-muxers --pkg-config-flags=--static --disable-debug --arch=x86_64 --enable-shared --disable-static --prefix=/tmp/ffmpeg
 
+For Linux builds the distribution compatibility is very important. Since our CI infrastructure currently runs on Ubuntu 14.04 the prebuilt libraries need to be compatible with this or an earilier version. The libraries in this repository have been compiled with Ubuntu 14.04. You can use Docker for getting an instance of Ubuntu 14.04 without actually installing the entire distribution.
+
 Vorbis and Theora are required but everything else can be removed. For Windows builds the script in [this repository](https://github.com/rdp/ffmpeg-windows-build-helpers) can be used. It allows to cross-compile everything that is needed from a Linux machine using MinGW. You will have to adjust the configure line to reduce the size of the libraries since the default version includes everything there is and that is way to much for us.
diff --git a/linux/ffmpeg/include/libavutil/ffversion.h b/linux/ffmpeg/include/libavutil/ffversion.h
@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "n3.4.4"
+#define FFMPEG_VERSION "3.4.4"
 #endif /* AVUTIL_FFVERSION_H */
diff --git a/linux/ffmpeg/lib/libavcodec.so.57.107.100 b/linux/ffmpeg/lib/libavcodec.so.57.107.100
diff --git a/linux/ffmpeg/lib/libavformat.so.57.83.100 b/linux/ffmpeg/lib/libavformat.so.57.83.100
diff --git a/linux/ffmpeg/lib/libavutil.so.55.78.100 b/linux/ffmpeg/lib/libavutil.so.55.78.100
diff --git a/linux/ffmpeg/lib/libswresample.so.2.9.100 b/linux/ffmpeg/lib/libswresample.so.2.9.100
diff --git a/linux/ffmpeg/lib/libswscale.so.4.8.100 b/linux/ffmpeg/lib/libswscale.so.4.8.100
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@ The linux builds were compiled with the following configure line:

		./configure --disable-programs --disable-doc --disable-avdevice --disable-postproc --disable-avfilter --disable-network --disable-encoders --disable-hwaccels --disable-muxers --pkg-config-flags=--static --disable-debug --arch=x86_64 --enable-shared --disable-static --prefix=/tmp/ffmpeg

		For Linux builds the distribution compatibility is very important. Since our CI infrastructure currently runs on Ubuntu 14.04 the prebuilt libraries need to be compatible with this or an earilier version. The libraries in this repository have been compiled with Ubuntu 14.04. You can use Docker for getting an instance of Ubuntu 14.04 without actually installing the entire distribution.

		Vorbis and Theora are required but everything else can be removed. For Windows builds the script in [this repository](https://github.com/rdp/ffmpeg-windows-build-helpers) can be used. It allows to cross-compile everything that is needed from a Linux machine using MinGW. You will have to adjust the configure line to reduce the size of the libraries since the default version includes everything there is and that is way to much for us.