diff --git a/ffmpeg/libfdk_aac-git/PKGBUILD b/ffmpeg/libfdk_aac-git/PKGBUILD
index 4177031c..1b1d569f 100644
--- a/ffmpeg/libfdk_aac-git/PKGBUILD
+++ b/ffmpeg/libfdk_aac-git/PKGBUILD
@@ -3,11 +3,11 @@ pkgname=ffmpeg-libfdk_aac-git
 pkgver=r74550.907373e
 pkgrel=1
 epoch=1
-pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
+pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('i686' 'x86_64')
 url='https://ffmpeg.org/'
 license=('GPL3' 'custom:libfdk-aac')
-depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass'
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame' 'libass'
          'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora'
          'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus'
          'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
@@ -39,6 +39,7 @@ build() {
     --enable-avisynth \
     --enable-avresample \
     --enable-fontconfig \
+    --enable-gmp \
     --enable-gnutls \
     --enable-gpl \
     --enable-ladspa \
diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
index 77a34bbd..056ad897 100644
--- a/ffmpeg/libfdk_aac/PKGBUILD
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -9,20 +9,19 @@
 
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
-pkgver=3.0.2
+pkgver=3.1.1
 pkgrel=1
 epoch=1
-pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
+pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('i686' 'x86_64')
 url='https://ffmpeg.org/'
 license=('GPL3' 'custom:libfdk-aac')
-depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame'
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame'
          'libass' 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh'
          'libtheora' 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg'
          'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
-         'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so'
-         'libvpx.so' 'libx264.so' 'libx265.so'
-	 'libfdk-aac')
+         'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so'
+         'libx264.so' 'libx265.so' 'libfdk-aac')
 makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm')
 optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
@@ -32,7 +31,7 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
 conflicts=("$_name")
 source=(http://ffmpeg.org/releases/$_name-$pkgver.tar.bz2{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-sha256sums=('30e3c77c2f4c358ed087869455a7496cbd7753a5e1b98d20ba49c1004009fd36'
+sha256sums=('a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4'
             'SKIP')
 
 build() {
@@ -46,12 +45,12 @@ build() {
     --enable-avisynth \
     --enable-avresample \
     --enable-fontconfig \
+    --enable-gmp \
     --enable-gnutls \
     --enable-gpl \
     --enable-ladspa \
     --enable-libass \
     --enable-libbluray \
-    --enable-libdcadec \
     --enable-libfreetype \
     --enable-libfribidi \
     --enable-libgsm \
diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD
index 67f5f7da..43972b5d 100644
--- a/ffmpeg/mingw-w64/PKGBUILD
+++ b/ffmpeg/mingw-w64/PKGBUILD
@@ -1,28 +1,26 @@
-# Contributor: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 # Contributor: Martchus <martchus@gmx.net>
 
 # This version includes the programs in contrast to the version found in the AUR.
 
 pkgname=mingw-w64-ffmpeg
-pkgver=3.0.1
+pkgver=3.1.1
 pkgrel=1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)"
 arch=('any')
 url="https://ffmpeg.org/"
 license=('GPL3')
-depends=(
-'mingw-w64-crt' 'mingw-w64-bzip2' 'mingw-w64-fontconfig' 'mingw-w64-fribidi' 'mingw-w64-gnutls'
-'mingw-w64-gsm' 'mingw-w64-lame' 'mingw-w64-libass' 'mingw-w64-dcadec' 'mingw-w64-libbluray' 'mingw-w64-libmodplug'
-'mingw-w64-libsoxr' 'mingw-w64-libtheora' 'mingw-w64-vid.stab' 'mingw-w64-libwebp' 'mingw-w64-libvorbis' 'mingw-w64-libvpx'
-'mingw-w64-opencore-amr' 'mingw-w64-openjpeg' 'mingw-w64-opus' 'mingw-w64-libssh' 'mingw-w64-schroedinger'
-'mingw-w64-sdl' 'mingw-w64-speex' 'mingw-w64-x264' 'mingw-w64-xvidcore' 'mingw-w64-zlib' 'mingw-w64-x265'
-)
+depends=('mingw-w64-crt' 'mingw-w64-bzip2' 'mingw-w64-fontconfig' 'mingw-w64-fribidi' 'mingw-w64-gmp' 'mingw-w64-gnutls'
+         'mingw-w64-gsm' 'mingw-w64-lame' 'mingw-w64-libass' 'mingw-w64-dcadec' 'mingw-w64-libbluray' 'mingw-w64-libmodplug'
+         'mingw-w64-libsoxr' 'mingw-w64-libtheora' 'mingw-w64-vid.stab' 'mingw-w64-libwebp' 'mingw-w64-libvorbis' 'mingw-w64-libvpx'
+         'mingw-w64-opencore-amr' 'mingw-w64-openjpeg' 'mingw-w64-opus' 'mingw-w64-libssh' 'mingw-w64-schroedinger'
+         'mingw-w64-sdl' 'mingw-w64-speex' 'mingw-w64-x264' 'mingw-w64-xvidcore' 'mingw-w64-zlib' 'mingw-w64-x265')
 options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'yasm')
 source=(http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('f7f7052c120f494dd501f96becff9b5a4ae10cfbde97bc2f1e9f0fd6613a4984'
+sha256sums=('a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4'
             'SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -42,11 +40,11 @@ build() {
         --enable-avisynth \
         --enable-avresample \
         --enable-fontconfig \
+        --enable-gmp \
         --enable-gnutls \
         --enable-gpl \
         --enable-libass \
         --enable-libbluray \
-        --enable-libdcadec \
         --enable-libfreetype \
         --enable-libfribidi \
         --enable-libgsm \