From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <mattatobin@localhost.localdomain>
Date: Fri, 2 Feb 2018 04:16:08 -0500
Subject: Add m-esr52 at 52.6.0

---
 media/libvpx/vpx_config.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 media/libvpx/vpx_config.h

(limited to 'media/libvpx/vpx_config.h')

diff --git a/media/libvpx/vpx_config.h b/media/libvpx/vpx_config.h
new file mode 100644
index 000000000..e5ab54272
--- /dev/null
+++ b/media/libvpx/vpx_config.h
@@ -0,0 +1,54 @@
+#if defined(VPX_X86_ASM)
+
+#if defined(_WIN64)
+/* 64 bit Windows */
+#ifdef _MSC_VER
+#include "vpx_config_x86_64-win64-vs12.h"
+#else
+#include "vpx_config_x86_64-win64-gcc.h"
+#endif
+
+#elif defined(_WIN32)
+/* 32 bit Windows, MSVC. */
+#ifdef _MSC_VER
+#include "vpx_config_x86-win32-vs12.h"
+#else
+#include "vpx_config_x86-win32-gcc.h"
+#endif
+
+#elif defined(__APPLE__) && defined(__x86_64__)
+/* 64 bit MacOS. */
+#include "vpx_config_x86_64-darwin9-gcc.h"
+
+#elif defined(__APPLE__) && defined(__i386__)
+/* 32 bit MacOS. */
+#include "vpx_config_x86-darwin9-gcc.h"
+
+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
+/* 32 bit ELF platforms. */
+#include "vpx_config_x86-linux-gcc.h"
+
+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
+/* 64 bit ELF platforms. */
+#include "vpx_config_x86_64-linux-gcc.h"
+
+#else
+#error VPX_X86_ASM is defined, but assembly not supported on this platform!
+#endif
+
+#elif defined(VPX_ARM_ASM)
+
+/* Android */
+#include "vpx_config_armv7-android-gcc.h"
+
+#else
+/* Assume generic GNU/GCC configuration. */
+#include "vpx_config_generic-gnu.h"
+#endif
+
+/* Control error-concealment support using our own #define rather than
+   hard-coding it. */
+#if defined(MOZ_VPX_ERROR_CONCEALMENT)
+#undef CONFIG_ERROR_CONCEALMENT
+#define CONFIG_ERROR_CONCEALMENT 1
+#endif
-- 
cgit v1.2.3