dirkmueller/ffmpeg-4
SHA256
1
0
Fork 0
forked from pool/ffmpeg-4
Code Pull Requests Activity

Accepting request 809832 from home:jirislaby:branches:multimedia:libs

Browse Source 
- 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
This commit is contained in:
Jan Engelhardt 2020-05-28 08:00:08 +00:00 committed by Git OBS Bridge
parent 70ab5e68a7
commit 58cec6c836
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg-4.2-dlopen-fdk_aac.patch
View File

@ -69,7 +69,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c
+#define aacDecoder_DecodeFrame dl_aacDecoder_DecodeFrame +#define aacDecoder_DecodeFrame dl_aacDecoder_DecodeFrame
+#define aacDecoder_GetStreamInfo dl_aacDecoder_GetStreamInfo +#define aacDecoder_GetStreamInfo dl_aacDecoder_GetStreamInfo
+#define aacDecoder_Close dl_aacDecoder_Close +#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);
+static int loadLibFdkAac(AVCodecContext *avctx) { +static int loadLibFdkAac(AVCodecContext *avctx) {
+ void *libfdkaac = NULL; + void *libfdkaac = NULL;
@ -136,7 +136,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c
+#define aacEncEncode dl_aacEncEncode +#define aacEncEncode dl_aacEncEncode
+#define aacEncInfo dl_aacEncInfo +#define aacEncInfo dl_aacEncInfo
+#define aacEncClose dl_aacEncClose +#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);
+static int loadLibFdkAac(AVCodecContext *avctx) { +static int loadLibFdkAac(AVCodecContext *avctx) {

5
ffmpeg-4.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 28 06:48:37 UTC 2020 - Jiri Slaby <jslaby@suse.com>
- libfdk-aac is now .so.2, not .so.1.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 11 09:40:09 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Mon May 11 09:40:09 UTC 2020 - Jan Engelhardt <jengelh@inai.de>