Backed out changeset a56901d19160 (bug 1925657) for causing Android build bustages.
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
# include "va/va.h"
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_AV1) && \
|
||||
#if defined(MOZ_AV1) && defined(MOZ_WIDGET_GTK) && \
|
||||
(defined(FFVPX_VERSION) || LIBAVCODEC_VERSION_MAJOR >= 59)
|
||||
# define FFMPEG_AV1_DECODE 1
|
||||
# include "AOMDecoder.h"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define OS_NAME linux
|
||||
#define av_restrict restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
#define EXTERN_ASM
|
||||
#define BUILDSUF ""
|
||||
#define SLIBSUF ".so"
|
||||
#define HAVE_MMX2 HAVE_MMXEXT
|
||||
@@ -479,7 +479,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define OS_NAME linux
|
||||
#define av_restrict restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
#define EXTERN_ASM
|
||||
#define BUILDSUF ""
|
||||
#define SLIBSUF ".so"
|
||||
#define HAVE_MMX2 HAVE_MMXEXT
|
||||
@@ -479,7 +479,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -439,7 +439,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -479,7 +479,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -474,7 +474,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define OS_NAME win32
|
||||
#define av_restrict restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
#define EXTERN_ASM
|
||||
#define BUILDSUF ""
|
||||
#define SLIBSUF ".dll"
|
||||
#define HAVE_MMX2 HAVE_MMXEXT
|
||||
@@ -474,7 +474,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.24.28315 for ARM64"
|
||||
#define av_restrict __restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
#define EXTERN_ASM
|
||||
#define BUILDSUF ""
|
||||
#define SLIBSUF ".dll"
|
||||
#define HAVE_MMX2 HAVE_MMXEXT
|
||||
@@ -439,7 +439,7 @@
|
||||
#define CONFIG_LIBCACA 0
|
||||
#define CONFIG_LIBCELT 0
|
||||
#define CONFIG_LIBCODEC2 0
|
||||
#define CONFIG_LIBDAV1D 1
|
||||
#define CONFIG_LIBDAV1D 0
|
||||
#define CONFIG_LIBDC1394 0
|
||||
#define CONFIG_LIBDRM 0
|
||||
#define CONFIG_LIBFLITE 0
|
||||
|
||||
Reference in New Issue
Block a user