From 7c59d819a7ebb936d51ca032e66a2489e4080d08 Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Sun, 1 May 2016 12:48:46 -0300
Subject: Update Opus driver to 1.1.2

And opusfile to 0.7.
---
 drivers/opus/celt/opus_custom_demo.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'drivers/opus/celt/opus_custom_demo.c')

diff --git a/drivers/opus/celt/opus_custom_demo.c b/drivers/opus/celt/opus_custom_demo.c
index b3129de779..956bec4e45 100644
--- a/drivers/opus/celt/opus_custom_demo.c
+++ b/drivers/opus/celt/opus_custom_demo.c
@@ -25,10 +25,7 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
-#ifdef OPUS_ENABLED
 #include "opus/opus_config.h"
-#endif
 
 #include "opus/opus_custom.h"
 #include "opus/celt/arch.h"
@@ -52,7 +49,7 @@ int main(int argc, char *argv[])
    int bytes_per_packet;
    unsigned char data[MAX_PACKET];
    int complexity;
-#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
+#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
    int i;
    double rmsd = 0;
 #endif
@@ -174,7 +171,7 @@ int main(int argc, char *argv[])
       for (i=0;i<ret*channels;i++)
          out[i] = in[i];
 #endif
-#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
+#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
       for (i=0;i<ret*channels;i++)
       {
          rmsd += (in[i]-out[i])*1.0*(in[i]-out[i]);
@@ -194,7 +191,7 @@ int main(int argc, char *argv[])
    opus_custom_mode_destroy(mode);
    free(in);
    free(out);
-#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
+#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
    if (rmsd > 0)
    {
       rmsd = sqrt(rmsd/(1.0*frame_size*channels*count));
-- 
cgit v1.2.3