From be806aa61da9b87cd68f34fd6fca303317596deb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 27 Oct 2016 23:23:59 +0200
Subject: [PATCH] Update ffmpeg to 3.1.5

---
 ffmpeg/libfdk_aac/PKGBUILD | 15 ++++-----------
 ffmpeg/mingw-w64/PKGBUILD  | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
index 87c37d8d..77581106 100644
--- a/ffmpeg/libfdk_aac/PKGBUILD
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -9,7 +9,7 @@
 
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
@@ -29,17 +29,10 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libswscale.so'
           "ffmpeg=$pkgver")
 conflicts=("$_name")
-source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc}
-        https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch)
+source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-sha256sums=('f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822'
-            'SKIP'
-            '336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8')
-
-#prepare() {
-#  cd ${_name}-${pkgver}
-#  patch -Np1 -i "$srcdir/ffmpeg_opj2.patch"
-#}
+sha256sums=('49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a'
+            'SKIP')
 
 build() {
   cd $_name-$pkgver
diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD
index d05e93f3..868f2e7b 100644
--- a/ffmpeg/mingw-w64/PKGBUILD
+++ b/ffmpeg/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 
 _name=ffmpeg
 pkgname=mingw-w64-ffmpeg
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (mingw-w64)'
@@ -21,19 +21,12 @@ depends=('mingw-w64-crt' 'mingw-w64-bzip2' 'mingw-w64-fontconfig' 'mingw-w64-fri
          'mingw-w64-zlib' 'mingw-w64-x265')
 options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'yasm')
-source=(https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz{,.asc}
-        https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch)
+source=(https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-sha256sums=('f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822'
-            'SKIP'
-            '336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8')
+sha256sums=('49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a'
+            'SKIP')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
-prepare() {
-  cd ${_name}-${pkgver}
-  patch -Np1 -i "$srcdir/ffmpeg_opj2.patch"
-}
-
 build() {
   for _arch in ${_architectures}; do
     mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch}