diff --git a/Scripts/ffmpeg-build.sh b/Scripts/ffmpeg-build.sh
index 41f1aeaa5..2bd0f2059 100755
--- a/Scripts/ffmpeg-build.sh
+++ b/Scripts/ffmpeg-build.sh
@@ -5,28 +5,23 @@
     --disable-ffprobe --disable-ffserver --disable-avdevice --disable-ffmpeg\
     --disable-postproc --disable-swresample --disable-avfilter\
     --disable-swscale --enable-network --disable-swscale-alpha --disable-vdpau\
-    --disable-dxva2 --enable-hwaccels\
-    --disable-encoders --disable-muxers --disable-indevs --disable-outdevs\
-    --disable-devices --disable-filters --disable-parsers --enable-parser=ac3\
-    --enable-parser=mpegaudio\
-    --enable-demuxer=ac3 --disable-bsfs --disable-bzlib --disable-protocols\
-    --disable-decoders --disable-decoder=libopus --disable-libopus\
-    --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2\
-    --enable-decoder=wmavoice --enable-decoder=wmalossless --enable-decoder=xma1\
-    --enable-decoder=xma2 --enable-decoder=dca --enable-decoder=ac3\
-    --disable-decoder=amrnb\
-    --disable-demuxers --enable-demuxer=asf --enable-demuxer=xwma\
-    --enable-demuxer=mov --enable-demuxer=oma --enable-demuxer=ac3\
-    --disable-demuxer=amr --enable-demuxer=ogg\
-    --enable-demuxer=tak --enable-decoder=tak\
-    --enable-decoder=dsd_lsbf --enable-decoder=dsd_lsbf_planar\
-    --enable-decoder=dsd_msbf --enable-decoder=dsd_msbf_planar\
-    --enable-demuxer=dsf --enable-demuxer=wav\
+    --disable-dxva2 --disable-everything --enable-hwaccels\
+    --enable-parser=ac3 --enable-demuxer=ac3 --enable-decoder=ac3\
+    --enable-parser=mpegaudio --enable-decoder=wmapro --enable-decoder=wmav1\
+    --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-decoder=wmalossless
+    --enable-decoder=xma1 --enable-decoder=xma2 --enable-demuxer=asf
+    --enable-demuxer=xwma --enable-decoder=dca --enable-demuxer=mov\
+    --enable-demuxer=oma --enable-demuxer=ogg --enable-demuxer=tak\
+    --enable-decoder=tak --enable-decoder=dsd_lsbf
+    --enable-decoder=dsd_lsbf_planar --enable-decoder=dsd_msbf
+    --enable-decoder=dsd_msbf_planar --enable-demuxer=dsf --enable-demuxer=wav\
     --enable-demuxer=aac --enable-decoder=aac\
     --enable-decoder=atrac3 --enable-decoder=atrac3p\
     --enable-demuxer=dts --enable-demuxer=dtshd\
     --enable-demuxer=mp3 --enable-decoder=mp3float\
-    --disable-libopencore-amrnb --disable-libopencore-amrwb\
-    --disable-version3
+    --disable-parser=mpeg4video --disable-parser=h263\
+    --disable-decoder=mpeg2video --disable-decoder=h263 --disable-decoder=h264\
+    --disable-decoder=mpeg1video --disable-decoder=mpeg2video\
+    --disable-decoder=mpeg4 --disable-version3
 
 make -j8
diff --git a/ThirdParty/ffmpeg/include/libavutil/ffversion.h b/ThirdParty/ffmpeg/include/libavutil/ffversion.h
index 89ff62f45..7260f20cd 100644
--- a/ThirdParty/ffmpeg/include/libavutil/ffversion.h
+++ b/ThirdParty/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.1.1"
+#define FFMPEG_VERSION "n3.1.1-2-g64aba84"
 #endif /* AVUTIL_FFVERSION_H */
diff --git a/ThirdParty/ffmpeg/lib/libavcodec.a b/ThirdParty/ffmpeg/lib/libavcodec.a
index 3f8b780bc..438c7c0ec 100644
Binary files a/ThirdParty/ffmpeg/lib/libavcodec.a and b/ThirdParty/ffmpeg/lib/libavcodec.a differ
diff --git a/ThirdParty/ffmpeg/lib/libavformat.a b/ThirdParty/ffmpeg/lib/libavformat.a
index c4f0761ef..15b6b534a 100644
Binary files a/ThirdParty/ffmpeg/lib/libavformat.a and b/ThirdParty/ffmpeg/lib/libavformat.a differ
diff --git a/ThirdParty/ffmpeg/lib/libavutil.a b/ThirdParty/ffmpeg/lib/libavutil.a
index 699fb8032..fc82b41a2 100644
Binary files a/ThirdParty/ffmpeg/lib/libavutil.a and b/ThirdParty/ffmpeg/lib/libavutil.a differ
diff --git a/ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc b/ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc
index 6992a4a50..44ddc997d 100644
--- a/ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc
+++ b/ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc
@@ -9,6 +9,6 @@ Version: 57.48.101
 Requires: libavutil >= 55.28.100
 Requires.private: 
 Conflicts:
-Libs: -L${libdir}  -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lz -pthread -framework CoreServices
+Libs: -L${libdir}  -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
 Libs.private: 
 Cflags: -I${includedir}
diff --git a/ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc b/ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc
index 621696d01..1d0578ab0 100644
--- a/ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc
+++ b/ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc
@@ -9,6 +9,6 @@ Version: 57.41.100
 Requires: libavcodec >= 57.48.101, libavutil >= 55.28.100
 Requires.private: 
 Conflicts:
-Libs: -L${libdir}  -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lz -pthread -framework CoreServices
+Libs: -L${libdir}  -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
 Libs.private: 
 Cflags: -I${includedir}