Upgrade to 4.3.1

2 files changed, 6 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0d943f23fc7..b4d7c11d1ae2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat May 30 18:00:10 UTC 2020
+# Sat Sep 19 11:38:10 UTC 2020
 pkgbase = ffmpeg-mmal
 	pkgdesc = ffmpeg built with MMAL hardware acceleration support for Raspberry Pi
-	pkgver = 4.2.3
+	pkgver = 4.3.1
 	pkgrel = 2
 	epoch = 1
 	url = https://ffmpeg.org/
@@ -76,7 +76,7 @@ pkgbase = ffmpeg-mmal
 	provides = libswresample.so
 	provides = libswscale.so
 	conflicts = ffmpeg
-	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb
 	source = vmaf-model-path.patch
 	sha256sums = SKIP
 	sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
diff --git a/PKGBUILD b/PKGBUILD
index aba9eb9989dc..6cefc440b227 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,10 +11,11 @@
 #  - remove depends on aom, remove --enable-libaom
 #  - remove depends on intel-media-sdk, remove --enable-libmfx
 #  - remove depends on vmaf, remove --enable-vmaf
+#  - remove depends on rav1e, remove --enable-librav1e
 # Upstream: https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/ffmpeg/PKGBUILD
 
 pkgname=ffmpeg-mmal
-pkgver=4.2.3
+pkgver=4.3.1
 pkgrel=2
 epoch=1
 pkgdesc='ffmpeg built with MMAL hardware acceleration support for Raspberry Pi'
@@ -95,7 +96,7 @@ provides=(
   libswscale.so
 )
 conflicts=('ffmpeg')
-_tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+_tag=6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
   vmaf-model-path.patch
@@ -114,10 +115,6 @@ pkgver() {
 prepare() {
   cd ffmpeg
 
-  # backport avisynthplus support
-  git show 6d8cddd1c67758636843f6a08295b3896c2e9ef8 -- libavformat/avisynth.c | git apply -
-  git show 56f59246293de417d27ea7e27cb9a7727ee579fb -- libavformat/avisynth.c | git apply -
-
   patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }