commit d3e8eda8398640fac1b51f6f986f4fbb3fb5dd21
author Karl Wiberg <kwiberg@webrtc.org> Thu Apr 23 14:07:06 2015 +0200
committer Karl Wiberg <kwiberg@webrtc.org> Thu Apr 23 12:06:46 2015 +0000
tree 2e610f60b931c24c2e24bdffe671e6df653693e7
parent 92f9eacd1353f04df61c9b52046fb34572742f6a

(Re-land) AudioEncoderDecoderIsac: Merge the two config structs

This reverts commit 599beb86, which in turn reverted 7c324cac. What
makes it work this time is that we don't remove the option of setting
bit_rate to 0 in order to ask for the default value.

COAUTHOR=henrik.lundin@webrtc.org
BUG=4228, chromium:478161
R=henrik.lundin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/48199004

Cr-Commit-Position: refs/heads/master@{#9068}

webrtc/modules/modules.gyp

diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index dbf0187..771e672 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -108,6 +108,7 @@
             'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',
             'audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc',
             'audio_coding/codecs/isac/fix/source/transform_unittest.cc',
+            'audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc',
             'audio_coding/codecs/isac/main/source/isac_unittest.cc',
             'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc',
             'audio_coding/codecs/opus/opus_unittest.cc',