summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/libaom/sources.mozbuild8
-rw-r--r--third_party/aom/CMakeLists.txt3
2 files changed, 3 insertions, 8 deletions
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index 3531d065a..078b30dca 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -109,8 +109,6 @@ files = {
'../../third_party/aom/av1/decoder/dthread.c',
'../../third_party/aom/av1/decoder/obu.c',
'../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
- '../../third_party/aom/stats/aomstats.c',
- '../../third_party/aom/stats/rate_hist.c',
],
'GENERIC_EXPORTS': [
'../../third_party/aom/aom/aom.h',
@@ -201,8 +199,6 @@ files = {
'../../third_party/aom/av1/decoder/detokenize.c',
'../../third_party/aom/av1/decoder/dthread.c',
'../../third_party/aom/av1/decoder/obu.c',
- '../../third_party/aom/stats/aomstats.c',
- '../../third_party/aom/stats/rate_hist.c',
],
'IA32_EXPORTS': [
'../../third_party/aom/aom/aom.h',
@@ -363,8 +359,6 @@ files = {
'../../third_party/aom/av1/decoder/detokenize.c',
'../../third_party/aom/av1/decoder/dthread.c',
'../../third_party/aom/av1/decoder/obu.c',
- '../../third_party/aom/stats/aomstats.c',
- '../../third_party/aom/stats/rate_hist.c',
],
'X64_EXPORTS': [
'../../third_party/aom/aom/aom.h',
@@ -524,7 +518,5 @@ files = {
'../../third_party/aom/av1/decoder/detokenize.c',
'../../third_party/aom/av1/decoder/dthread.c',
'../../third_party/aom/av1/decoder/obu.c',
- '../../third_party/aom/stats/aomstats.c',
- '../../third_party/aom/stats/rate_hist.c',
],
}
diff --git a/third_party/aom/CMakeLists.txt b/third_party/aom/CMakeLists.txt
index 0b445722d..a1e810d49 100644
--- a/third_party/aom/CMakeLists.txt
+++ b/third_party/aom/CMakeLists.txt
@@ -255,7 +255,10 @@ add_rtcd_build_step("${AOM_ROOT}/av1/common/av1_rtcd_defs.pl"
add_library(aom_rtcd OBJECT ${AOM_RTCD_SOURCES})
add_dependencies(aom_rtcd aom_version)
+if (ENABLE_EXAMPLES)
add_library(aom_encoder_stats OBJECT ${AOM_ENCODER_STATS_SOURCES})
+endif ()
+
add_library(aom ${AOM_SOURCES} $<TARGET_OBJECTS:aom_rtcd>)
if(NOT MSVC AND NOT APPLE)