qzhao/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

-

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=73
This commit is contained in:
Ismail Dönmez 2019-06-28 08:28:01 +00:00 committed by Git OBS Bridge
parent 9c9a7087da
commit f7ff0f34d5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch
View File

@ -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.orig/libavcodec/libfdk-aacdec.c
+++ ffmpeg-4.1.3/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 #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
#endif #endif
@ -196,7 +206,7 @@ Index: ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c
enum ConcealMethod { enum ConcealMethod {
CONCEAL_METHOD_SPECTRAL_MUTING = 0, CONCEAL_METHOD_SPECTRAL_MUTING = 0,
CONCEAL_METHOD_NOISE_SUBSTITUTION = 1, 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; FDKAACDecContext *s = avctx->priv_data;
AAC_DECODER_ERROR err; AAC_DECODER_ERROR err;