author | Randell Jesup <rjesup@jesup.org> |
Wed, 04 Apr 2012 14:49:12 -0400 | |
changeset 97251 | 8fe9bb1baa2d0e087bc19c64214c1f4fed278789 |
parent 97250 | b7c47028aa524ce9ced521bd7258808fbfa12fa6 |
child 97252 | a7376a73b1af447cc0618c6d9f2c14e8bb46cafd |
push id | 22966 |
push user | emorley@mozilla.com |
push date | Thu, 21 Jun 2012 20:01:01 +0000 |
treeherder | mozilla-central@98b13bbe2a51 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | cpearce |
bugs | 731407 |
milestone | 16.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
|
--- a/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseFilter.cpp +++ b/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseFilter.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 <assert.h> #include "BaseFilter.h" #include "BasePin.h" namespace mozilla { namespace media { // Used by BaseFilter to enumerate pins on a DirectShow filter. // If the number of pins on the filter changes while an EnumPins
--- a/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseFilter.h +++ b/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseFilter.h @@ -2,16 +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/. */ #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_BASEFILTER_H_ #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_BASEFILTER_H_ +#include <assert.h> #include "dshow.h" #include <comdef.h> #include "DShowTools.h" #include <string> namespace mozilla { namespace media { @@ -151,9 +152,9 @@ protected: unsigned long mRefCnt; }; _COM_SMARTPTR_TYPEDEF(BaseFilter, __uuidof(BaseFilter)); } } -#endif \ No newline at end of file +#endif
--- a/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseInputPin.cpp +++ b/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BaseInputPin.cpp @@ -1,14 +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 <assert.h> #include "BaseInputPin.h" #include <vector> using namespace std; namespace mozilla { namespace media {
--- a/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BasePin.cpp +++ b/media/webrtc/trunk/src/modules/video_capture/main/source/Windows/BasePin.cpp @@ -1,14 +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 <assert.h> #include "nsAutoPtr.h" #include "BasePin.h" namespace mozilla { namespace media { // Implements IEnumMediaTypes for nsBasePin::EnumMediaTypes(). // Does not support dynamic media types.