Bug 944900 - Fix content/media/fmp4 compilation on mingw. r=cpearce
authorJacek Caban <jacek@codeweavers.com>
Mon, 02 Dec 2013 12:12:35 +0100
changeset 158195 5c3bbaf73d5ebf74e67c6ace265d348b1e233d03
parent 158194 c1e2e3d9b4eb6415e6cbcc609341a85c351e62ca
child 158196 21acc8e198763b6f59f66dfe62f4a3113dd4a051
push id36951
push userjacek@codeweavers.com
push dateMon, 02 Dec 2013 11:26:52 +0000
treeherdermozilla-inbound@53fba09e3003 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs944900
milestone28.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
Bug 944900 - Fix content/media/fmp4 compilation on mingw. r=cpearce
content/media/fmp4/demuxer/audio_decoder_config.cc
content/media/fmp4/demuxer/basictypes.h
content/media/fmp4/demuxer/video_decoder_config.cc
content/media/fmp4/wmf/MFTDecoder.h
content/media/fmp4/wmf/WMFAudioDecoder.h
content/media/fmp4/wmf/WMFDecoderModule.cpp
content/media/fmp4/wmf/WMFVideoDecoder.h
--- a/content/media/fmp4/demuxer/audio_decoder_config.cc
+++ b/content/media/fmp4/demuxer/audio_decoder_config.cc
@@ -1,15 +1,16 @@
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mp4_demuxer/audio_decoder_config.h"
 
 #include <sstream>
+#include <string.h>
 
 namespace mp4_demuxer {
 
 static int SampleFormatToBitsPerChannel(SampleFormat sample_format) {
   switch (sample_format) {
     case kUnknownSampleFormat:
       return 0;
     case kSampleFormatU8:
--- a/content/media/fmp4/demuxer/basictypes.h
+++ b/content/media/fmp4/demuxer/basictypes.h
@@ -1,16 +1,17 @@
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MP4_BASIC_TYPES_H_
 #define MEDIA_MP4_BASIC_TYPES_H_
 
 #include <iostream>
+#include <limits>
 #include <stdint.h>
 #include "prlog.h"
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* GetDemuxerLog();
 #endif
 
 namespace mp4_demuxer {
--- a/content/media/fmp4/demuxer/video_decoder_config.cc
+++ b/content/media/fmp4/demuxer/video_decoder_config.cc
@@ -1,15 +1,16 @@
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mp4_demuxer/video_decoder_config.h"
 
 #include <sstream>
+#include <string.h>
 
 namespace mp4_demuxer {
 
 VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
       format_(VideoFrameFormat::INVALID),
       is_encrypted_(false) {
--- a/content/media/fmp4/wmf/MFTDecoder.h
+++ b/content/media/fmp4/wmf/MFTDecoder.h
@@ -2,17 +2,17 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #if !defined(MFTDecoder_h_)
 #define MFTDecoder_h_
 
-#include "wmf.h"
+#include "WMF.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "nsIThread.h"
 
 namespace mozilla {
 
 class MFTDecoder {
 public:
--- a/content/media/fmp4/wmf/WMFAudioDecoder.h
+++ b/content/media/fmp4/wmf/WMFAudioDecoder.h
@@ -2,17 +2,17 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #if !defined(WMFAudioDecoder_h_)
 #define WMFAudioDecoder_h_
 
-#include "wmf.h"
+#include "WMF.h"
 #include "MP4Reader.h"
 #include "MFTDecoder.h"
 
 namespace mozilla {
 
 class WMFAudioDecoder : public MediaDataDecoder {
 public:
   WMFAudioDecoder();
--- a/content/media/fmp4/wmf/WMFDecoderModule.cpp
+++ b/content/media/fmp4/wmf/WMFDecoderModule.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "wmf.h"
+#include "WMF.h"
 #include "WMFDecoderModule.h"
 #include "WMFDecoder.h"
 #include "WMFVideoDecoder.h"
 #include "WMFAudioDecoder.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/DebugOnly.h"
 
 namespace mozilla {
--- a/content/media/fmp4/wmf/WMFVideoDecoder.h
+++ b/content/media/fmp4/wmf/WMFVideoDecoder.h
@@ -2,17 +2,17 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #if !defined(WMFVideoDecoder_h_)
 #define WMFVideoDecoder_h_
 
-#include "wmf.h"
+#include "WMF.h"
 #include "MP4Reader.h"
 #include "MFTDecoder.h"
 #include "nsRect.h"
 
 #include "mozilla/RefPtr.h"
 
 namespace mozilla {
 
@@ -70,9 +70,9 @@ private:
   const bool mDXVAEnabled;
   bool mUseHwAccel;
 };
 
 
 
 } // namespace mozilla
 
-#endif
\ No newline at end of file
+#endif