[vlc-commits] contrib: aom: disable av1 encoder

[Tristan Matthews]

vlc/vlc-3.0 | branch: master | Tristan Matthews <tmatth at videolan.org> | Thu Oct  4 11:41:33 2018 -0400| [e43004ec8a747fe2f436154abc80725b08685d4a] | committer: Tristan Matthews

contrib: aom: disable av1 encoder

Encoding hasn't been backported.

Reverts 2f9f827f9e98267d337ca88b5d04d276055ef2b3

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e43004ec8a747fe2f436154abc80725b08685d4a
---

 contrib/src/aom/rules.mak | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index fd84c3a5e3..b1a2fe14d0 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -38,11 +38,8 @@ AOM_CONF := \
 	-DENABLE_TESTS=OFF \
 	-DCONFIG_INSTALL_BINS=0 \
 	-DCONFIG_INSTALL_DOCS=0 \
-	-DCONFIG_DEPENDENCY_TRACKING=0
-
-ifndef BUILD_ENCODERS
-AOM_CONF += -DCONFIG_AV1_ENCODER=0
-endif
+	-DCONFIG_DEPENDENCY_TRACKING=0 \
+	-DCONFIG_AV1_ENCODER=0
 
 ifndef HAVE_WIN32
 AOM_CONF += -DCONFIG_PIC=1