Merge beta to m-r a=merge
authorWes Kocher <wkocher@mozilla.com>
Wed, 28 Oct 2015 13:15:22 -0700
changeset 291313 7c0672cba1de
parent 291311 a09f90a74e72 (current diff)
parent 291312 8e6007ac23a1 (diff)
child 291318 e59a1a631240
child 291319 34182086e962
push id939
push userkwierso@gmail.com
push date2015-10-28 20:15 +0000
treeherdermozilla-release@7c0672cba1de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone42.0
Merge beta to m-r a=merge
--- a/dom/media/platforms/android/AndroidDecoderModule.cpp
+++ b/dom/media/platforms/android/AndroidDecoderModule.cpp
@@ -250,17 +250,17 @@ public:
     NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
 
     nsRefPtr<AudioData> data = new AudioData(0, presentationTimeUs,
                                            aDuration.ToMicroseconds(),
                                            numFrames,
                                            audio,
                                            numChannels,
                                            sampleRate);
-    INVOKE_CALLBACK(Output, data);
+    ENVOKE_CALLBACK(Output, data);
     return NS_OK;
   }
 };
 
 
 bool AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType)
 {
   if (!AndroidBridge::Bridge() || (AndroidBridge::Bridge()->GetAPIVersion() < 16)) {