Fix build bustage for bug 877461
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 07 Jun 2013 20:16:17 +1200
changeset 145842 744b50c28290aab3e7c0e57fc8f907b76cbc2253
parent 145841 0285f4360664dd705c97c46978c9bb364268e590
child 145843 e5a427cac5cf96638c59f5e8339f08c3d29f1f88
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs877461
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix build bustage for bug 877461
content/media/plugins/MPAPI.h
--- a/content/media/plugins/MPAPI.h
+++ b/content/media/plugins/MPAPI.h
@@ -22,17 +22,17 @@ enum ColorFormat {
 class BufferCallback {
 public:
   virtual void *operator()(size_t aWidth, size_t aHeight,
                            ColorFormat aColorFormat) = 0;
 };
 
 struct VideoPlane {
   VideoPlane() :
-    mData(nullptr),
+    mData(0),
     mStride(0),
     mWidth(0),
     mHeight(0),
     mOffset(0),
     mSkip(0)
   {}
 
   void *mData;
@@ -53,17 +53,17 @@ struct VideoFrame {
   int32_t mRotation;
   VideoPlane Y;
   VideoPlane Cb;
   VideoPlane Cr;
 
   VideoFrame() :
     mTimeUs(0),
     mKeyFrame(false),
-    mData(nullptr),
+    mData(0),
     mSize(0),
     mStride(0),
     mSliceHeight(0),
     mRotation(0)
   {}
 
   void Set(int64_t aTimeUs, bool aKeyFrame,
            void *aData, size_t aSize, int32_t aStride, int32_t aSliceHeight, int32_t aRotation,