change to use aomedia copyright notice

av1/common/allcommon.h
doc.mk

Change-Id: I7e08c9131ab1c0d7e7854f7e70b90397d041143a

diff --git a/av1/common/alloccommon.h b/av1/common/alloccommon.h
index ad0b454b005f4f697d944cef6ad7498fc5c1370a..0a0c38c3575269d7cddbbb473ed041b381c4e491 100644 (file)
--- a/av1/common/alloccommon.h
+++ b/av1/common/alloccommon.h
@@ -1,11 +1,12 @@
 /*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
  *
- *  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.
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
 #ifndef AV1_COMMON_ALLOCCOMMON_H_

diff --git a/docs.mk b/docs.mk
index 889d18251ffcbb4929554db21e2e453e1e2ab4c3..0dfc65b75f4eee5af2913f0793962bd3b509d75c 100644 (file)
--- a/docs.mk
+++ b/docs.mk
@@ -1,14 +1,16 @@
 ##
-##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+## Copyright (c) 2016, Alliance for Open Media. All rights reserved
 ##
-##  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.
+## This source code is subject to the terms of the BSD 2 Clause License and
+## the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+## was not distributed with this source code in the LICENSE file, you can
+## obtain it at www.aomedia.org/license/software. If the Alliance for Open
+## Media Patent License 1.0 was not distributed with this source code in the
+## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
 ##
 
 
+
 INSTALL_MAPS += docs/%    docs/%
 INSTALL_MAPS += src/%     %
 INSTALL_MAPS += %         %