diff -up comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.webrtc-system-ogg comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
--- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.webrtc-system-ogg	2015-09-02 11:27:27.000000000 +0200
+++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi	2015-09-06 00:44:07.652570851 +0200
@@ -17,17 +17,21 @@
       'conditions': [
         ['build_with_mozilla==1', {
           # Mozilla provides its own build of the opus library.
-          'include_dirs': [
-            '/media/libopus/include',
-            '/media/libopus/src',
-            '/media/libopus/celt',
+          'cflags_mozilla': [
+            '-I/usr/include/opus',
           ],
+	  'include_dirs': [
+	     '/media/libopus/src',
+	     '/media/libopus/celt',
+	  ],
           'direct_dependent_settings': {
-            'include_dirs': [
-              '/media/libopus/include',
-              '/media/libopus/src',
-              '/media/libopus/celt',
+            'cflags_mozilla': [
+              '-I/usr/include/opus',
             ],
+	    'include_dirs': [
+	      '/media/libopus/src',
+	      '/media/libopus/celt',
+	    ],
           },
         }, {
           'dependencies': [
diff -up comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus_inst.h.webrtc-system-ogg comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus_inst.h
--- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus_inst.h.webrtc-system-ogg	2015-09-02 11:27:27.000000000 +0200
+++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus_inst.h	2015-09-06 00:44:07.661570764 +0200
@@ -11,7 +11,9 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_
 
+#pragma GCC visibility push(default)
 #include "opus.h"
+#pragma GCC visibility pop
 
 struct WebRtcOpusEncInst {
   OpusEncoder* encoder;
diff -up comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.cc.webrtc-system-ogg comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.cc
--- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.cc.webrtc-system-ogg	2015-09-02 11:27:27.000000000 +0200
+++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.cc	2015-09-06 02:01:24.918861606 +0200
@@ -15,56 +15,19 @@
 
 namespace webrtc {
 
-static const int kDefaultSampleRateHz = 48000;
-static const int kDefaultFrameRateHz = 50;
-static const int kDefaultFrameSizeSamples =
-    kDefaultSampleRateHz / kDefaultFrameRateHz;
-static const float kDefaultThreshold = 0.5f;
-
 AudioClassifier::AudioClassifier()
     : analysis_info_(),
       is_music_(false),
       music_probability_(0),
-      // This actually assigns the pointer to a static constant struct
-      // rather than creates a struct and |celt_mode_| does not need
-      // to be deleted.
-      celt_mode_(opus_custom_mode_create(kDefaultSampleRateHz,
-                                         kDefaultFrameSizeSamples,
-                                         NULL)),
+      celt_mode_(0),
       analysis_state_() {
-  assert(celt_mode_);
 }
 
 AudioClassifier::~AudioClassifier() {}
 
-bool AudioClassifier::Analysis(const int16_t* input,
-                               int input_length,
-                               int channels) {
-  // Must be 20 ms frames at 48 kHz sampling.
-  assert((input_length / channels) == kDefaultFrameSizeSamples);
-
-  // Only mono or stereo are allowed.
-  assert(channels == 1 || channels == 2);
-
-  // Call Opus' classifier, defined in
-  // "third_party/opus/src/src/analysis.h", with lsb_depth = 16.
-  // Also uses a down-mixing function downmix_int, defined in
-  // "third_party/opus/src/src/opus_private.h", with
-  // constants c1 = 0, and c2 = -2.
-  run_analysis(&analysis_state_,
-               celt_mode_,
-               input,
-               kDefaultFrameSizeSamples,
-               kDefaultFrameSizeSamples,
-               0,
-               -2,
-               channels,
-               kDefaultSampleRateHz,
-               16,
-               downmix_int,
-               &analysis_info_);
-  music_probability_ = analysis_info_.music_prob;
-  is_music_ = music_probability_ > kDefaultThreshold;
+bool AudioClassifier::Analysis(const int16_t*,
+                               int,
+                               int) {
   return is_music_;
 }