Index: webrtc/media/base/capturemanager.h |
diff --git a/talk/media/base/capturemanager.h b/webrtc/media/base/capturemanager.h |
similarity index 64% |
rename from talk/media/base/capturemanager.h |
rename to webrtc/media/base/capturemanager.h |
index 8cbbf5258c4dbe57744c1d1a4450dcf48197dabe..94022a9e4e098211d32854b1aa70793eddd810ee 100644 |
--- a/talk/media/base/capturemanager.h |
+++ b/webrtc/media/base/capturemanager.h |
@@ -1,28 +1,11 @@ |
/* |
- * libjingle |
- * Copyright 2012 Google Inc. |
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
* |
- * Redistribution and use in source and binary forms, with or without |
- * modification, are permitted provided that the following conditions are met: |
- * |
- * 1. Redistributions of source code must retain the above copyright notice, |
- * this list of conditions and the following disclaimer. |
- * 2. Redistributions in binary form must reproduce the above copyright notice, |
- * this list of conditions and the following disclaimer in the documentation |
- * and/or other materials provided with the distribution. |
- * 3. The name of the author may not be used to endorse or promote products |
- * derived from this software without specific prior written permission. |
- * |
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+ * Use of this source code is governed by a BSD-style license |
+ * that can be found in the LICENSE file in the root of the source |
+ * tree. An additional intellectual property rights grant can be found |
+ * in the file PATENTS. All contributing project authors may |
+ * be found in the AUTHORS file in the root of the source tree. |
*/ |
// The CaptureManager class manages VideoCapturers to make it possible to share |
@@ -38,16 +21,16 @@ |
// thread which is normally a separate unmarshalled thread and thus normally |
// require lock protection. |
-#ifndef TALK_MEDIA_BASE_CAPTUREMANAGER_H_ |
-#define TALK_MEDIA_BASE_CAPTUREMANAGER_H_ |
+#ifndef WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_ |
+#define WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_ |
#include <map> |
#include <vector> |
-#include "talk/media/base/capturerenderadapter.h" |
-#include "talk/media/base/videocommon.h" |
#include "webrtc/base/sigslotrepeater.h" |
#include "webrtc/base/thread_checker.h" |
+#include "webrtc/media/base/capturerenderadapter.h" |
+#include "webrtc/media/base/videocommon.h" |
namespace cricket { |
@@ -105,4 +88,4 @@ class CaptureManager : public sigslot::has_slots<> { |
} // namespace cricket |
-#endif // TALK_MEDIA_BASE_CAPTUREMANAGER_H_ |
+#endif // WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_ |