Bug 1290629 - Make default cam, which is supposed to model a real cam, nonetheless independent of webrtc includes.
MozReview-Commit-ID: 2RiRxXCNHv6
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@@ -4,19 +4,29 @@
#ifndef MediaEngineCameraVideoSource_h
#define MediaEngineCameraVideoSource_h
#include "MediaEngine.h"
#include "nsDirectoryServiceDefs.h"
+#ifdef MOZ_WEBRTC
// conflicts with #include of scoped_ptr.h
#undef FF
#include "webrtc/video_engine/include/vie_capture.h"
+#else
+namespace webrtc
+{
+ struct CaptureCapability {
+ unsigned int width, height, maxFPS;
+ CaptureCapability() : width(0), height(0), maxFPS(0) {}
+ };
+}
+#endif
namespace mozilla {
bool operator == (const webrtc::CaptureCapability& a,
const webrtc::CaptureCapability& b);
bool operator != (const webrtc::CaptureCapability& a,
const webrtc::CaptureCapability& b);