From f7ff0f34d57b7636878168fcf8dac8252eae7c5634c70206d89550be36074796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 28 Jun 2019 08:28:01 +0000
Subject: [PATCH] -

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=73
---
 ...open-faac-mp3lame-opencore-x264-x265-xvid.patch | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch b/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch
index 41a6c09..38e1de8 100644
--- a/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch
+++ b/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch
@@ -141,7 +141,17 @@ Index: ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c
 ===================================================================
 --- ffmpeg-4.1.3.orig/libavcodec/libfdk-aacdec.c
 +++ ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c
-@@ -37,6 +37,54 @@
+@@ -17,7 +17,9 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#ifndef CONFIG_LIBFDK_AAC_DLOPEN
+ #include <fdk-aac/aacdecoder_lib.h>
++#endif
+ 
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+@@ -37,6 +39,54 @@
  #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
  #endif
  
@@ -196,7 +206,7 @@ Index: ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c
  enum ConcealMethod {
      CONCEAL_METHOD_SPECTRAL_MUTING      =  0,
      CONCEAL_METHOD_NOISE_SUBSTITUTION   =  1,
-@@ -224,6 +272,11 @@ static av_cold int fdk_aac_decode_init(A
+@@ -224,6 +274,11 @@ static av_cold int fdk_aac_decode_init(A
      FDKAACDecContext *s = avctx->priv_data;
      AAC_DECODER_ERROR err;