Bug 1137957 - Fix non-unified build failure in GMPVideoDecoder. r=kinetik a=lmandel
authorChris Pearce <cpearce@mozilla.com>
Sat, 28 Feb 2015 16:15:29 +1300
changeset 250225 a7098648876a
parent 250224 d56acccf3b69
child 250226 1ef0bf557169
push id4521
push usercpearce@mozilla.com
push date2015-03-04 01:22 +0000
treeherdermozilla-beta@8abdbdecd2d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik, lmandel
bugs1137957
milestone37.0
Bug 1137957 - Fix non-unified build failure in GMPVideoDecoder. r=kinetik a=lmandel
dom/media/fmp4/gmp/GMPAudioDecoder.cpp
dom/media/fmp4/gmp/GMPVideoDecoder.cpp
--- a/dom/media/fmp4/gmp/GMPAudioDecoder.cpp
+++ b/dom/media/fmp4/gmp/GMPAudioDecoder.cpp
@@ -4,17 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPAudioDecoder.h"
 
 namespace mozilla {
 
 #if defined(DEBUG)
-static bool IsOnGMPThread()
+bool IsOnGMPThread()
 {
   nsCOMPtr<mozIGeckoMediaPluginService> mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
   MOZ_ASSERT(mps);
 
   nsCOMPtr<nsIThread> gmpThread;
   nsresult rv = mps->GetThread(getter_AddRefs(gmpThread));
   MOZ_ASSERT(NS_SUCCEEDED(rv) && gmpThread);
   return NS_GetCurrentThread() == gmpThread;
--- a/dom/media/fmp4/gmp/GMPVideoDecoder.cpp
+++ b/dom/media/fmp4/gmp/GMPVideoDecoder.cpp
@@ -6,17 +6,17 @@
 
 #include "GMPVideoDecoder.h"
 #include "GMPVideoHost.h"
 #include "prsystem.h"
 
 namespace mozilla {
 
 #if defined(DEBUG)
-static bool IsOnGMPThread();
+extern bool IsOnGMPThread();
 #endif
 
 void
 VideoCallbackAdapter::Decoded(GMPVideoi420Frame* aDecodedFrame)
 {
   GMPUnique<GMPVideoi420Frame>::Ptr decodedFrame(aDecodedFrame);
 
   MOZ_ASSERT(IsOnGMPThread());