Sync ffmpeg-libfdk_aac with regular ffmpeg and rebuild against new x265

ffmpeg/libfdk_aac/PKGBUILD

@@ -10,7 +10,7 @@
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('x86_64')
@@ -97,6 +97,12 @@ pkgver() {
   git describe --tags | sed 's/^n//'
 }
 
+prepare() {
+  cd ffmpeg
+
+  git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+}
+
 build() {
   cd $_name