Bug 941296 - Fix non-unified build. r=bustage CLOSED TREE

We need to include a headers defining nsrefcnt and NS_IsMainThread(),
and make sure we reference the CMLinker versions of the CoreMedia
functions rather than the system ones.

content/media/fmp4/apple/AppleCMLinker.cpp

@@ -7,6 +7,7 @@
 #include <dlfcn.h>
 
 #include "AppleCMLinker.h"
+#include "MainThreadUtils.h"
 #include "nsDebug.h"
 
 #ifdef PR_LOGGING

content/media/fmp4/apple/AppleCMLinker.h

@@ -13,6 +13,8 @@ extern "C" {
 #pragma GCC visibility pop
 }
 
+#include "nscore.h"
+
 namespace mozilla {
 
 class AppleCMLinker

content/media/fmp4/apple/AppleVTDecoder.cpp

@@ -13,6 +13,7 @@
 #include "MP4Decoder.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
+#include "AppleCMLinker.h"
 #include "AppleVTDecoder.h"
 #include "AppleVTLinker.h"
 #include "prlog.h"

content/media/fmp4/apple/AppleVTLinker.cpp

@@ -7,6 +7,7 @@
 #include <dlfcn.h>
 
 #include "AppleVTLinker.h"
+#include "MainThreadUtils.h"
 #include "nsDebug.h"
 
 #ifdef PR_LOGGING

content/media/fmp4/apple/AppleVTLinker.h

@@ -13,6 +13,8 @@ extern "C" {
 #pragma GCC visibility pop
 }
 
+#include "nscore.h"
+
 namespace mozilla {
 
 class AppleVTLinker