From 6f41ad0f457170d8ae0e664586c852925670aca2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 7 Jun 2020 00:52:22 +0200
Subject: [PATCH] Sync ffmpeg-libfdk_aac with regular version

* Update version, dependencies and configure flags
* Rebuild against x265 3.4
---
 ffmpeg-libfdk_aac/default  |  1 +
 ffmpeg/libfdk_aac/PKGBUILD | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 120000 ffmpeg-libfdk_aac/default

diff --git a/ffmpeg-libfdk_aac/default b/ffmpeg-libfdk_aac/default
new file mode 120000
index 00000000..f70a1d10
--- /dev/null
+++ b/ffmpeg-libfdk_aac/default
@@ -0,0 +1 @@
+../ffmpeg/libfdk_aac
\ No newline at end of file
diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
index 318fdb48..4e7935a0 100644
--- a/ffmpeg/libfdk_aac/PKGBUILD
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -9,8 +9,8 @@
 
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
-pkgver=4.2.2
-pkgrel=8
+pkgver=4.2.3
+pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('x86_64')
@@ -79,6 +79,7 @@ makedepends=(
   nasm
 )
 optdepends=(
+  'avisynthplus: AviSynthPlus support'
   'intel-media-sdk: Intel QuickSync support'
   'ladspa: LADSPA filters'
   'nvidia-utils: Nvidia NVDEC/NVENC support'
@@ -96,10 +97,14 @@ provides=(
 )
 conflicts=("$_name")
 
-source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0
-        vmaf-model-path.patch)
-sha256sums=('SKIP'
-            '8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d')
+source=(
+  git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+  vmaf-model-path.patch
+)
+sha256sums=(
+  SKIP
+  8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+)
 
 pkgver() {
   cd ffmpeg
@@ -110,9 +115,11 @@ pkgver() {
 prepare() {
   cd ffmpeg
 
-  git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+  # lavf/mp3dec: don't adjust start time; packets are not adjusted
+  # https://crbug.com/1062037
+  git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
 
-  patch -Np1 -i "${srcdir}/vmaf-model-path.patch"
+  patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }
 
 build() {
@@ -123,6 +130,7 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
+    --enable-avisynth \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gnutls \