Move aom source to a sub-directory under media/libaom

There is no damned reason to treat this differently than any other media lib given its license and there never was.

1 files changed, 0 insertions, 70 deletions

diff --git a/third_party/aom/aom_mem/aom_mem.h b/third_party/aom/aom_mem/aom_mem.h
deleted file mode 100644
index 4b1fa45f1..000000000
--- a/third_party/aom/aom_mem/aom_mem.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#ifndef AOM_AOM_MEM_AOM_MEM_H_
-#define AOM_AOM_MEM_AOM_MEM_H_
-
-#include "aom/aom_integer.h"
-#include "config/aom_config.h"
-
-#if defined(__uClinux__)
-#include <lddk.h>
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef AOM_MAX_ALLOCABLE_MEMORY
-#if SIZE_MAX > (1ULL << 32)
-#define AOM_MAX_ALLOCABLE_MEMORY 8589934592  // 8 GB
-#else
-// For 32-bit targets keep this below INT_MAX to avoid valgrind warnings.
-#define AOM_MAX_ALLOCABLE_MEMORY ((1ULL << 31) - (1 << 16))
-#endif
-#endif
-
-void *aom_memalign(size_t align, size_t size);
-void *aom_malloc(size_t size);
-void *aom_calloc(size_t num, size_t size);
-void aom_free(void *memblk);
-void *aom_memset16(void *dest, int val, size_t length);
-
-#include <string.h>
-
-#ifdef AOM_MEM_PLTFRM
-#include AOM_MEM_PLTFRM
-#endif
-
-#if CONFIG_DEBUG
-#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)                         \
-  do {                                                                      \
-    lval = (expr);                                                          \
-    if (!lval)                                                              \
-      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR,                   \
-                         "Failed to allocate " #lval " at %s:%d", __FILE__, \
-                         __LINE__);                                         \
-  } while (0)
-#else
-#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)       \
-  do {                                                    \
-    lval = (expr);                                        \
-    if (!lval)                                            \
-      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR, \
-                         "Failed to allocate " #lval);    \
-  } while (0)
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif  // AOM_AOM_MEM_AOM_MEM_H_