commit ba02c24cfe7875da7e10369bf93a9c85bf70bcbf
author Tom Finegan <tomfinegan@google.com> Tue May 16 15:01:54 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Mon May 22 22:35:37 2017 +0000
tree bb67ddd5deb9365138cc43c87f86650d1643ceb8
parent fea5f401ab4c54768ceffae38353c83742289c9e

Remove CONFIG_{DE,EN}CODERS from the CMake build.

Use CONFIG_AV1_{DE,EN}CODER to control decoder and
encoder support inclusion instead.

BUG=aomedia:76,aomedia:508

Change-Id: Ib150ae382b301885589f30d9b6e98d3bfdd1afce

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index c268656..ec1935a 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "aom/aom_encoder.h"
-#if CONFIG_DECODERS
+#if CONFIG_AV1_DECODER
 #include "aom/aom_decoder.h"
 #endif
 
@@ -1337,13 +1337,13 @@
     ctx_exit_on_error(&stream->encoder, "Failed to control codec");
   }
 
-#if CONFIG_DECODERS
+#if CONFIG_AV1_DECODER
   if (global->test_decode != TEST_DECODE_OFF) {
     const AvxInterface *decoder = get_aom_decoder_by_name(global->codec->name);
     aom_codec_dec_cfg_t cfg = { 0, 0, 0 };
     aom_codec_dec_init(&stream->decoder, decoder->codec_interface(), &cfg, 0);
 
-#if CONFIG_AV1_DECODER && CONFIG_EXT_TILE
+#if CONFIG_EXT_TILE
     if (strcmp(global->codec->name, "av1") == 0) {
       aom_codec_control(&stream->decoder, AV1_SET_DECODE_TILE_ROW, -1);
       ctx_exit_on_error(&stream->decoder, "Failed to set decode_tile_row");
@@ -1503,7 +1503,7 @@
         stream->nbytes += pkt->data.raw.sz;
 
         *got_data = 1;
-#if CONFIG_DECODERS
+#if CONFIG_AV1_DECODER
         if (global->test_decode != TEST_DECODE_OFF && !stream->mismatch_seen) {
           aom_codec_decode(&stream->decoder, pkt->data.frame.buf,
                            (unsigned int)pkt->data.frame.sz, NULL, 0);