From 58cec6c8369c53f7ff3028c2e4cfd43ed8e4a46c1f190fcacd0d372f91bd6628 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 May 2020 08:00:08 +0000 Subject: [PATCH] Accepting request 809832 from home:jirislaby:branches:multimedia:libs - libfdk-aac is now .so.2, not .so.1. OBS-URL: https://build.opensuse.org/request/show/809832 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=117 --- ffmpeg-4.2-dlopen-fdk_aac.patch | 4 ++-- ffmpeg-4.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ffmpeg-4.2-dlopen-fdk_aac.patch b/ffmpeg-4.2-dlopen-fdk_aac.patch index f5a0c66..0627e40 100644 --- a/ffmpeg-4.2-dlopen-fdk_aac.patch +++ b/ffmpeg-4.2-dlopen-fdk_aac.patch @@ -69,7 +69,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c +#define aacDecoder_DecodeFrame dl_aacDecoder_DecodeFrame +#define aacDecoder_GetStreamInfo dl_aacDecoder_GetStreamInfo +#define aacDecoder_Close dl_aacDecoder_Close -+#define FDKAAC_LIB "libfdk-aac.so.1" ++#define FDKAAC_LIB "libfdk-aac.so.2" +static int loadLibFdkAac(AVCodecContext *avctx); +static int loadLibFdkAac(AVCodecContext *avctx) { + void *libfdkaac = NULL; @@ -136,7 +136,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c +#define aacEncEncode dl_aacEncEncode +#define aacEncInfo dl_aacEncInfo +#define aacEncClose dl_aacEncClose -+#define FDKAAC_LIB "libfdk-aac.so.1" ++#define FDKAAC_LIB "libfdk-aac.so.2" + +static int loadLibFdkAac(AVCodecContext *avctx); +static int loadLibFdkAac(AVCodecContext *avctx) { diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 2694e42..62d60f2 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 28 06:48:37 UTC 2020 - Jiri Slaby + +- libfdk-aac is now .so.2, not .so.1. + ------------------------------------------------------------------- Mon May 11 09:40:09 UTC 2020 - Jan Engelhardt