media/libopus/nonunified.patch
author Robert Strong <robert.bugzilla@gmail.com>
Wed, 19 Oct 2016 13:27:01 -0700
changeset 348675 4d6033fadbc589a5f6170803e6af65ed8de5c96d
parent 314841 60e81558a5e8a46a75b204314b157fa12ee40075
child 412913 1025e2d81d4d852fb816c4de7f6311fcd8e90922
permissions -rw-r--r--
Client code for Bug 1309125 - Allow configuration of the download throttle via the update.xml. r=mhowell, a=rkothari

diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
index 8a39b9f..dfc2c62 100644
--- a/media/libopus/sources.mozbuild
+++ b/media/libopus/sources.mozbuild
@@ -2,8 +2,6 @@
 celt_sources = [
     'celt/bands.c',
     'celt/celt.c',
-    'celt/celt_decoder.c',
-    'celt/celt_encoder.c',
     'celt/celt_lpc.c',
     'celt/cwrs.c',
     'celt/entcode.c',
@@ -20,6 +18,15 @@ celt_sources = [
     'celt/vq.c',
 ]
 
+opus_nonunified_sources = [
+    # Disabled because of name clash of opus_custom_encoder_get_size.
+    'celt/celt_decoder.c',
+    'celt/celt_encoder.c',
+    # Disabled for (safe) warning about QA redefinition.
+    'silk/LPC_inv_pred_gain.c',
+    'silk/NLSF2A.c',
+]
+
 celt_sources_sse = [
     'celt/x86/pitch_sse.c',
     'celt/x86/x86_celt_map.c',
@@ -105,8 +112,6 @@ silk_sources = [
     'silk/log2lin.c',
     'silk/LP_variable_cutoff.c',
     'silk/LPC_analysis_filter.c',
-    'silk/LPC_inv_pred_gain.c',
-    'silk/NLSF2A.c',
     'silk/NLSF_decode.c',
     'silk/NLSF_del_dec_quant.c',
     'silk/NLSF_encode.c',