diff --git a/common/shlibs b/common/shlibs
index eaa67489fff..7e23c87e0c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -393,14 +393,15 @@ libid3tag.so.0 libid3tag-0.15.1b_1
 libgif.so.7 giflib-5.1.0_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.56 libavdevice-2.4.1_1
-libavformat.so.56 libavformat-2.4.1_1
-libswscale.so.3 libswscale-2.4.1_1
-libswresample.so.1 libswresample-2.4.1_1
-libpostproc.so.53 libpostproc-2.4.1_1
-libavcodec.so.56 libavcodec-2.4.1_1
-libavutil.so.54 libavutil-2.4.1_1
-libavfilter.so.5 libavfilter-2.4.1_1
+libavdevice.so.57 libavdevice-3.1.3_1
+libavformat.so.57 libavformat-3.1.3_1
+libswscale.so.4 libswscale-3.1.3_1
+libswresample.so.2 libswresample-3.1.3_1
+libavresample.so.3 libavresample-3.1.3_1
+libpostproc.so.54 libpostproc-3.1.3_1
+libavcodec.so.57 libavcodec-3.1.3_1
+libavutil.so.55 libavutil-3.1.3_1
+libavfilter.so.6 libavfilter-3.1.3_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.142 x264-20140928.2245_1
@@ -2342,7 +2343,6 @@ libges-0.10.so.0 gst-editing-services-0.10.1_1
 libykneomgr.so.0 libykneomgr-0.1.8_1
 libopenshot-audio.so.3 libopenshot-audio-0.0.6_1
 libopenshot.so.9 libopenshot-0.1.2_1
-libavresample.so.2 libavresample-2.8.5_3
 libpqxx-4.0.so libpqxx-4.0.1_1
 libndpi.so.1 ndpi-1.6_1
 liblog4cxx.so.10 log4cxx-0.10.0_1
@@ -2412,7 +2412,7 @@ libcmark.so.0 cmark-0.24.1_1
 libspotify.so.12 libspotify-12.1.51_1
 libwiredtiger-2.8.0.so wiredtiger-2.8.0_1
 libvidstab.so.0.9 libvidstab-0.98b_1
-libxdo.so.3 xdotool-3.20150503.1_1 
+libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.2 libgnome-games-support-1.2.0_1
 libwlc.so.0 wlc-0.0.2_1
@@ -2434,7 +2434,7 @@ libobsglad.so.0 obs-0.14.1_2
 libobs-opengl.so.0 obs-0.14.1_2
 libzimg.so.2 zimg-2.0.4_1
 libvapoursynth.so vapoursynth-R32_2
-libvapoursynth-script.so.0 vapoursynth-R32_1 
+libvapoursynth-script.so.0 vapoursynth-R32_1
 libtwolame.so.0 twolame-0.3.13_1
 libsignon-plugins.so.1 signond-8.58_1
 libsignon-qt5.so.1 signond-8.58_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 3b2debaadb8..0e2af4fec66 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,13 +1,13 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=2.8.7
-revision=6
+version=3.1.3
+revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-checksum=8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5
+checksum=58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -27,6 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_configure() {
+	# Fix gcc on x86_64-musl only
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+		sed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';"
+	fi
+
 	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in
 			arm*) _arch="arm";;