From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- media/libopus/nonunified.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 media/libopus/nonunified.patch (limited to 'media/libopus/nonunified.patch') diff --git a/media/libopus/nonunified.patch b/media/libopus/nonunified.patch new file mode 100644 index 000000000..cf9ff554f --- /dev/null +++ b/media/libopus/nonunified.patch @@ -0,0 +1,38 @@ +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', -- cgit v1.2.3