forked from pool/ffmpeg-4
Revert last
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=74
This commit is contained in:
parent
f7ff0f34d5
commit
04de1162ee
@ -141,16 +141,6 @@ 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
|
||||||
@@ -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 @@
|
@@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user