commit 7319db51cf5858f42c30d77251881b0407247802
author Krishna Rapaka <krapaka@apple.com> Tue Sep 28 20:35:29 2021 -0700
committer Krishna Rapaka <krapaka@apple.com> Tue Sep 28 20:35:29 2021 -0700
tree a2c5e6e4267b49e01fff12dc34bcff5b3fa0c20d
parent cd7748ae5ea033c182885013432c9beeac17eea5

Update BSD-3 license for AVM project and files

av1/arg_defs.c

diff --git a/av1/arg_defs.c b/av1/arg_defs.c
index 8059ece..e3341c2 100644
--- a/av1/arg_defs.c
+++ b/av1/arg_defs.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/arg_defs.h"

av1/arg_defs.h

diff --git a/av1/arg_defs.h b/av1/arg_defs.h
index afd35b3..9c8cb14 100644
--- a/av1/arg_defs.h
+++ b/av1/arg_defs.h
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ARG_DEFS_H_
 #define AOM_AV1_ARG_DEFS_H_

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index 6925b68..d6d17d3 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2017, Alliance for Open Media. All rights reserved
+# Copyright (c) 2021, Alliance for Open Media. All rights reserved
 #
-# 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
+# This source code is subject to the terms of the BSD 3-Clause Clear License and the
+# Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear 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
+# at aomedia.org/license/software-license/bsd-3-c-c/.  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.
+# can obtain it at aomedia.org/license/patent-license/.
 #
 if(AOM_AV1_AV1_CMAKE_)
   return()

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 61ad932..52cb907 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <stdlib.h>
 #include <string.h>

av1/av1_dx_iface.c

diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index 52d4181..b757fd7 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/av1_iface_common.h

diff --git a/av1/av1_iface_common.h b/av1/av1_iface_common.h
index 24c2d46..78cc8be 100644
--- a/av1/av1_iface_common.h
+++ b/av1/av1_iface_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_AV1_IFACE_COMMON_H_
 #define AOM_AV1_AV1_IFACE_COMMON_H_

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index d11f8f7..d5787c5 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/common/alloccommon.h

diff --git a/av1/common/alloccommon.h b/av1/common/alloccommon.h
index fe8e0c5..226a15f 100644
--- a/av1/common/alloccommon.h
+++ b/av1/common/alloccommon.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_ALLOCCOMMON_H_

av1/common/arm/av1_inv_txfm_neon.c

diff --git a/av1/common/arm/av1_inv_txfm_neon.c b/av1/common/arm/av1_inv_txfm_neon.c
index 2f3567a..aff2dc1 100644
--- a/av1/common/arm/av1_inv_txfm_neon.c
+++ b/av1/common/arm/av1_inv_txfm_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/av1_inv_txfm_neon.h

diff --git a/av1/common/arm/av1_inv_txfm_neon.h b/av1/common/arm/av1_inv_txfm_neon.h
index 9ec6582..fba2f35 100644
--- a/av1/common/arm/av1_inv_txfm_neon.h
+++ b/av1/common/arm/av1_inv_txfm_neon.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_ARM_AV1_INV_TXFM_NEON_H_
 #define AOM_AV1_COMMON_ARM_AV1_INV_TXFM_NEON_H_

av1/common/arm/av1_txfm_neon.c

diff --git a/av1/common/arm/av1_txfm_neon.c b/av1/common/arm/av1_txfm_neon.c
index 7e3a05a..207ee55 100644
--- a/av1/common/arm/av1_txfm_neon.c
+++ b/av1/common/arm/av1_txfm_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <arm_neon.h>
 #include <assert.h>

av1/common/arm/blend_a64_hmask_neon.c

diff --git a/av1/common/arm/blend_a64_hmask_neon.c b/av1/common/arm/blend_a64_hmask_neon.c
index 7134f18..f7f2e81 100644
--- a/av1/common/arm/blend_a64_hmask_neon.c
+++ b/av1/common/arm/blend_a64_hmask_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/blend_a64_vmask_neon.c

diff --git a/av1/common/arm/blend_a64_vmask_neon.c b/av1/common/arm/blend_a64_vmask_neon.c
index 194e94c..b04131a 100644
--- a/av1/common/arm/blend_a64_vmask_neon.c
+++ b/av1/common/arm/blend_a64_vmask_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/cfl_neon.c

diff --git a/av1/common/arm/cfl_neon.c b/av1/common/arm/cfl_neon.c
index 39025b5..6d5d7af 100644
--- a/av1/common/arm/cfl_neon.c
+++ b/av1/common/arm/cfl_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <arm_neon.h>
 

av1/common/arm/convolve_neon.c

diff --git a/av1/common/arm/convolve_neon.c b/av1/common/arm/convolve_neon.c
index f72c919..6491e49 100644
--- a/av1/common/arm/convolve_neon.c
+++ b/av1/common/arm/convolve_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/arm/highbd_inv_txfm_neon.c

diff --git a/av1/common/arm/highbd_inv_txfm_neon.c b/av1/common/arm/highbd_inv_txfm_neon.c
index 9bd9c4a..6715985 100644
--- a/av1/common/arm/highbd_inv_txfm_neon.c
+++ b/av1/common/arm/highbd_inv_txfm_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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 canzip
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/jnt_convolve_neon.c

diff --git a/av1/common/arm/jnt_convolve_neon.c b/av1/common/arm/jnt_convolve_neon.c
index e41e3a5..67f4291 100644
--- a/av1/common/arm/jnt_convolve_neon.c
+++ b/av1/common/arm/jnt_convolve_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/reconinter_neon.c

diff --git a/av1/common/arm/reconinter_neon.c b/av1/common/arm/reconinter_neon.c
index 44e0641..34f2844 100644
--- a/av1/common/arm/reconinter_neon.c
+++ b/av1/common/arm/reconinter_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/reconintra_neon.c

diff --git a/av1/common/arm/reconintra_neon.c b/av1/common/arm/reconintra_neon.c
index 367d295..b10c224 100644
--- a/av1/common/arm/reconintra_neon.c
+++ b/av1/common/arm/reconintra_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/resize_neon.c

diff --git a/av1/common/arm/resize_neon.c b/av1/common/arm/resize_neon.c
index 8808631..86ce20c 100644
--- a/av1/common/arm/resize_neon.c
+++ b/av1/common/arm/resize_neon.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <arm_neon.h>
 #include <assert.h>

av1/common/arm/selfguided_neon.c

diff --git a/av1/common/arm/selfguided_neon.c b/av1/common/arm/selfguided_neon.c
index 80d53c4..db3db49 100644
--- a/av1/common/arm/selfguided_neon.c
+++ b/av1/common/arm/selfguided_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/arm/warp_plane_neon.c

diff --git a/av1/common/arm/warp_plane_neon.c b/av1/common/arm/warp_plane_neon.c
index c31b2a0..2be8523 100644
--- a/av1/common/arm/warp_plane_neon.c
+++ b/av1/common/arm/warp_plane_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/arm/wiener_convolve_neon.c

diff --git a/av1/common/arm/wiener_convolve_neon.c b/av1/common/arm/wiener_convolve_neon.c
index a9bb5bc..f98a851 100644
--- a/av1/common/arm/wiener_convolve_neon.c
+++ b/av1/common/arm/wiener_convolve_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/common/av1_common_int.h

diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h
index d221903..341509a 100644
--- a/av1/common/av1_common_int.h
+++ b/av1/common/av1_common_int.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_AV1_COMMON_INT_H_

av1/common/av1_inv_txfm1d.c

diff --git a/av1/common/av1_inv_txfm1d.c b/av1/common/av1_inv_txfm1d.c
index 8d69efc..1a3c20d 100644
--- a/av1/common/av1_inv_txfm1d.c
+++ b/av1/common/av1_inv_txfm1d.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/common/av1_inv_txfm1d.h

diff --git a/av1/common/av1_inv_txfm1d.h b/av1/common/av1_inv_txfm1d.h
index e1d5d98..fdba26a 100644
--- a/av1/common/av1_inv_txfm1d.h
+++ b/av1/common/av1_inv_txfm1d.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_AV1_INV_TXFM1D_H_

av1/common/av1_inv_txfm1d_cfg.h

diff --git a/av1/common/av1_inv_txfm1d_cfg.h b/av1/common/av1_inv_txfm1d_cfg.h
index 47fedbd..9e921b4 100644
--- a/av1/common/av1_inv_txfm1d_cfg.h
+++ b/av1/common/av1_inv_txfm1d_cfg.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_AV1_INV_TXFM1D_CFG_H_

av1/common/av1_inv_txfm2d.c

diff --git a/av1/common/av1_inv_txfm2d.c b/av1/common/av1_inv_txfm2d.c
index 559d121..81890c6 100644
--- a/av1/common/av1_inv_txfm2d.c
+++ b/av1/common/av1_inv_txfm2d.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_dsp_rtcd.h"

av1/common/av1_loopfilter.c

diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index 6bbb854..eba3ee7 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/av1_loopfilter.h

diff --git a/av1/common/av1_loopfilter.h b/av1/common/av1_loopfilter.h
index ca16bbe..72a49be 100644
--- a/av1/common/av1_loopfilter.h
+++ b/av1/common/av1_loopfilter.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_AV1_LOOPFILTER_H_

av1/common/av1_rtcd.c

diff --git a/av1/common/av1_rtcd.c b/av1/common/av1_rtcd.c
index a77a4d2..39b7522 100644
--- a/av1/common/av1_rtcd.c
+++ b/av1/common/av1_rtcd.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include "config/aom_config.h"
 

av1/common/av1_rtcd_defs.pl

diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 4861b56..250d153 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -1,12 +1,12 @@
 ##
-## Copyright (c) 2017, Alliance for Open Media. All rights reserved
+## Copyright (c) 2021, Alliance for Open Media. All rights reserved
 ##
-## 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.
+## This source code is subject to the terms of the BSD 3-Clause Clear License and the
+## Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+## not distributed with this source code in the LICENSE file, you can obtain it
+## at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
 ##
 sub av1_common_forward_decls() {
 print <<EOF

av1/common/av1_txfm.c

diff --git a/av1/common/av1_txfm.c b/av1/common/av1_txfm.c
index ac43402..031b314 100644
--- a/av1/common/av1_txfm.c
+++ b/av1/common/av1_txfm.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_dsp_rtcd.h"

av1/common/av1_txfm.h

diff --git a/av1/common/av1_txfm.h b/av1/common/av1_txfm.h
index 20049b6..2875d95 100644
--- a/av1/common/av1_txfm.h
+++ b/av1/common/av1_txfm.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_AV1_TXFM_H_

av1/common/blockd.c

diff --git a/av1/common/blockd.c b/av1/common/blockd.c
index e8612f2..885bf31 100644
--- a/av1/common/blockd.c
+++ b/av1/common/blockd.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 9d7f5ce..524f78e 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_BLOCKD_H_

av1/common/ccso.c

diff --git a/av1/common/ccso.c b/av1/common/ccso.c
index 5596ceb..270157c 100644
--- a/av1/common/ccso.c
+++ b/av1/common/ccso.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/ccso.h

diff --git a/av1/common/ccso.h b/av1/common/ccso.h
index bf05e6f..acac6dd 100644
--- a/av1/common/ccso.h
+++ b/av1/common/ccso.h
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CCSO_H_

av1/common/cdef.c

diff --git a/av1/common/cdef.c b/av1/common/cdef.c
index ffb0159..d442d6d 100644
--- a/av1/common/cdef.c
+++ b/av1/common/cdef.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/cdef.h

diff --git a/av1/common/cdef.h b/av1/common/cdef.h
index 4d6e600..3fa2e42 100644
--- a/av1/common/cdef.h
+++ b/av1/common/cdef.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_CDEF_H_
 #define AOM_AV1_COMMON_CDEF_H_

av1/common/cdef_block.c

diff --git a/av1/common/cdef_block.c b/av1/common/cdef_block.c
index 7120705..3f9ade0 100644
--- a/av1/common/cdef_block.c
+++ b/av1/common/cdef_block.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/cdef_block.h

diff --git a/av1/common/cdef_block.h b/av1/common/cdef_block.h
index 6b0ae0a..b8cb99f 100644
--- a/av1/common/cdef_block.h
+++ b/av1/common/cdef_block.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CDEF_BLOCK_H_

av1/common/cdef_block_avx2.c

diff --git a/av1/common/cdef_block_avx2.c b/av1/common/cdef_block_avx2.c
index e2b85b3..55bc231 100644
--- a/av1/common/cdef_block_avx2.c
+++ b/av1/common/cdef_block_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_simd.h"

av1/common/cdef_block_neon.c

diff --git a/av1/common/cdef_block_neon.c b/av1/common/cdef_block_neon.c
index 2d6bc65..01af81b 100644
--- a/av1/common/cdef_block_neon.c
+++ b/av1/common/cdef_block_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_simd.h"

av1/common/cdef_block_simd.h

diff --git a/av1/common/cdef_block_simd.h b/av1/common/cdef_block_simd.h
index 5a52bc1..1873edd 100644
--- a/av1/common/cdef_block_simd.h
+++ b/av1/common/cdef_block_simd.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CDEF_BLOCK_SIMD_H_

av1/common/cdef_block_sse2.c

diff --git a/av1/common/cdef_block_sse2.c b/av1/common/cdef_block_sse2.c
index 73f115d..f87942a 100644
--- a/av1/common/cdef_block_sse2.c
+++ b/av1/common/cdef_block_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_simd.h"

av1/common/cdef_block_sse4.c

diff --git a/av1/common/cdef_block_sse4.c b/av1/common/cdef_block_sse4.c
index 349329a..455dd14 100644
--- a/av1/common/cdef_block_sse4.c
+++ b/av1/common/cdef_block_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_simd.h"

av1/common/cdef_block_ssse3.c

diff --git a/av1/common/cdef_block_ssse3.c b/av1/common/cdef_block_ssse3.c
index 3a93b15..e5e91b8 100644
--- a/av1/common/cdef_block_ssse3.c
+++ b/av1/common/cdef_block_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_simd.h"

av1/common/cfl.c

diff --git a/av1/common/cfl.c b/av1/common/cfl.c
index 718f6c0..c12ffd3 100644
--- a/av1/common/cfl.c
+++ b/av1/common/cfl.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/av1_common_int.h"

av1/common/cfl.h

diff --git a/av1/common/cfl.h b/av1/common/cfl.h
index 2463e2d..1183363 100644
--- a/av1/common/cfl.h
+++ b/av1/common/cfl.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CFL_H_

av1/common/common.h

diff --git a/av1/common/common.h b/av1/common/common.h
index bed6083..1848059 100644
--- a/av1/common/common.h
+++ b/av1/common/common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_COMMON_H_

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index ca47b4a..22dd20e 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_COMMON_DATA_H_

av1/common/convolve.c

diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index e55c3c9..d97cebf 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/convolve.h

diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index ee8da60..6dac32a 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CONVOLVE_H_

av1/common/debugmodes.c

diff --git a/av1/common/debugmodes.c b/av1/common/debugmodes.c
index 4d8a9c2..7b7b285 100644
--- a/av1/common/debugmodes.c
+++ b/av1/common/debugmodes.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdio.h>

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index a5594c4..7ba8f3d 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/common/entropy.h

diff --git a/av1/common/entropy.h b/av1/common/entropy.h
index ee78f56..99f6790 100644
--- a/av1/common/entropy.h
+++ b/av1/common/entropy.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_ENTROPY_H_

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 4bb978b..4d30bf2 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_mem/aom_mem.h"

av1/common/entropymode.h

diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 235542b..1e6873f 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_ENTROPYMODE_H_

av1/common/entropymv.c

diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index e1e42f2..8f5cdd1 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/av1_common_int.h"

av1/common/entropymv.h

diff --git a/av1/common/entropymv.h b/av1/common/entropymv.h
index cddc807..8b20f06 100644
--- a/av1/common/entropymv.h
+++ b/av1/common/entropymv.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_ENTROPYMV_H_

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index 697fdee..d8cf067 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_ENUMS_H_

av1/common/filter.h

diff --git a/av1/common/filter.h b/av1/common/filter.h
index 16a9450..27d0efb 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_FILTER_H_

av1/common/frame_buffers.c

diff --git a/av1/common/frame_buffers.c b/av1/common/frame_buffers.c
index f10ccd5..ed1fda9 100644
--- a/av1/common/frame_buffers.c
+++ b/av1/common/frame_buffers.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/frame_buffers.h

diff --git a/av1/common/frame_buffers.h b/av1/common/frame_buffers.h
index 16188e5..4b2451f 100644
--- a/av1/common/frame_buffers.h
+++ b/av1/common/frame_buffers.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_FRAME_BUFFERS_H_

av1/common/idct.c

diff --git a/av1/common/idct.c b/av1/common/idct.c
index 457fe62..ffbd28b 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/idct.h

diff --git a/av1/common/idct.h b/av1/common/idct.h
index 9d71530..8ce3f9f 100644
--- a/av1/common/idct.h
+++ b/av1/common/idct.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_IDCT_H_

av1/common/loopfiltermask.c

diff --git a/av1/common/loopfiltermask.c b/av1/common/loopfiltermask.c
index 1189358..97e3487 100644
--- a/av1/common/loopfiltermask.c
+++ b/av1/common/loopfiltermask.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/mv.h

diff --git a/av1/common/mv.h b/av1/common/mv.h
index be539e8..aea4f72 100644
--- a/av1/common/mv.h
+++ b/av1/common/mv.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_MV_H_

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 2d2a90f..e808f70 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/common/mvref_common.h

diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index 19a8577..99ac56d 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_MVREF_COMMON_H_
 #define AOM_AV1_COMMON_MVREF_COMMON_H_

av1/common/obmc.h

diff --git a/av1/common/obmc.h b/av1/common/obmc.h
index 2f233cf..1b27330 100644
--- a/av1/common/obmc.h
+++ b/av1/common/obmc.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_OBMC_H_

av1/common/obu_util.c

diff --git a/av1/common/obu_util.c b/av1/common/obu_util.c
index 7d2694b..107b075 100644
--- a/av1/common/obu_util.c
+++ b/av1/common/obu_util.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 

av1/common/obu_util.h

diff --git a/av1/common/obu_util.h b/av1/common/obu_util.h
index 7c56904..18f9c14 100644
--- a/av1/common/obu_util.h
+++ b/av1/common/obu_util.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_OBU_UTIL_H_
 #define AOM_AV1_COMMON_OBU_UTIL_H_

av1/common/odintrin.c

diff --git a/av1/common/odintrin.c b/av1/common/odintrin.c
index 7584b2e..3ef5c9e 100644
--- a/av1/common/odintrin.c
+++ b/av1/common/odintrin.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /* clang-format off */

av1/common/odintrin.h

diff --git a/av1/common/odintrin.h b/av1/common/odintrin.h
index e1db0f4..666a78c 100644
--- a/av1/common/odintrin.h
+++ b/av1/common/odintrin.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /* clang-format off */

av1/common/ppc/cfl_ppc.c

diff --git a/av1/common/ppc/cfl_ppc.c b/av1/common/ppc/cfl_ppc.c
index 6f88768..2bf75e6 100644
--- a/av1/common/ppc/cfl_ppc.c
+++ b/av1/common/ppc/cfl_ppc.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <altivec.h>

av1/common/pred_common.c

diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c
index da5e8ad..1c32bbc 100644
--- a/av1/common/pred_common.c
+++ b/av1/common/pred_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/common.h"

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 593fb50..220fd4a 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_PRED_COMMON_H_

av1/common/quant_common.c

diff --git a/av1/common/quant_common.c b/av1/common/quant_common.c
index 9318e53..307f535 100644
--- a/av1/common/quant_common.c
+++ b/av1/common/quant_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/av1_common_int.h"

av1/common/quant_common.h

diff --git a/av1/common/quant_common.h b/av1/common/quant_common.h
index 5cde276..2ec9947 100644
--- a/av1/common/quant_common.h
+++ b/av1/common/quant_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_QUANT_COMMON_H_

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index b03024e..670ce91 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index 6e6ab2c..28a265b 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_RECONINTER_H_

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 73197b8..6321c00 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/common/reconintra.h

diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index a0e6e9a..4044544 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_RECONINTRA_H_

av1/common/resize.c

diff --git a/av1/common/resize.c b/av1/common/resize.c
index 95d3368..e7526d5 100644
--- a/av1/common/resize.c
+++ b/av1/common/resize.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/resize.h

diff --git a/av1/common/resize.h b/av1/common/resize.h
index b08de80..ed9219c 100644
--- a/av1/common/resize.h
+++ b/av1/common/resize.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_RESIZE_H_

av1/common/restoration.c

diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index d1f64c4..c4a8d53 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  *
  */
 

av1/common/restoration.h

diff --git a/av1/common/restoration.h b/av1/common/restoration.h
index 338c9e7c..c7715ae 100644
--- a/av1/common/restoration.h
+++ b/av1/common/restoration.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_RESTORATION_H_

av1/common/scale.c

diff --git a/av1/common/scale.c b/av1/common/scale.c
index 5bcd8df..91f2e90 100644
--- a/av1/common/scale.c
+++ b/av1/common/scale.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_dsp_rtcd.h"

av1/common/scale.h

diff --git a/av1/common/scale.h b/av1/common/scale.h
index fd30416..a776930 100644
--- a/av1/common/scale.h
+++ b/av1/common/scale.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_SCALE_H_

av1/common/scan.c

diff --git a/av1/common/scan.c b/av1/common/scan.c
index c1d4f35..79f96e3 100644
--- a/av1/common/scan.c
+++ b/av1/common/scan.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/scan.h

diff --git a/av1/common/scan.h b/av1/common/scan.h
index 9e5cbb0..0f70a68 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_SCAN_H_

av1/common/seg_common.c

diff --git a/av1/common/seg_common.c b/av1/common/seg_common.c
index 60b1851..1b7f7db 100644
--- a/av1/common/seg_common.c
+++ b/av1/common/seg_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/seg_common.h

diff --git a/av1/common/seg_common.h b/av1/common/seg_common.h
index aeb9c17..8c1b45a 100644
--- a/av1/common/seg_common.h
+++ b/av1/common/seg_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_SEG_COMMON_H_

av1/common/thread_common.c

diff --git a/av1/common/thread_common.c b/av1/common/thread_common.c
index f3c8795..d92e288 100644
--- a/av1/common/thread_common.c
+++ b/av1/common/thread_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/common/thread_common.h

diff --git a/av1/common/thread_common.h b/av1/common/thread_common.h
index 7397f1c..2e27e9c 100644
--- a/av1/common/thread_common.h
+++ b/av1/common/thread_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_THREAD_COMMON_H_

av1/common/tile_common.c

diff --git a/av1/common/tile_common.c b/av1/common/tile_common.c
index 1b11bd7..fbe8419 100644
--- a/av1/common/tile_common.c
+++ b/av1/common/tile_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/av1_common_int.h"

av1/common/tile_common.h

diff --git a/av1/common/tile_common.h b/av1/common/tile_common.h
index ca7c5f4..bb95227 100644
--- a/av1/common/tile_common.h
+++ b/av1/common/tile_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_TILE_COMMON_H_

av1/common/timing.c

diff --git a/av1/common/timing.c b/av1/common/timing.c
index a959cdf..044f5d4 100644
--- a/av1/common/timing.c
+++ b/av1/common/timing.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/timing.h"

av1/common/timing.h

diff --git a/av1/common/timing.h b/av1/common/timing.h
index 9192124..f508af6 100644
--- a/av1/common/timing.h
+++ b/av1/common/timing.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_TIMING_H_

av1/common/token_cdfs.h

diff --git a/av1/common/token_cdfs.h b/av1/common/token_cdfs.h
index f1edda5..15f66c7 100644
--- a/av1/common/token_cdfs.h
+++ b/av1/common/token_cdfs.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_TOKEN_CDFS_H_

av1/common/txb_common.c

diff --git a/av1/common/txb_common.c b/av1/common/txb_common.c
index eb4be64..05e81f3 100644
--- a/av1/common/txb_common.c
+++ b/av1/common/txb_common.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include "aom/aom_integer.h"
 #include "av1/common/av1_common_int.h"

av1/common/txb_common.h

diff --git a/av1/common/txb_common.h b/av1/common/txb_common.h
index 306ba3d..518fa55 100644
--- a/av1/common/txb_common.h
+++ b/av1/common/txb_common.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_TXB_COMMON_H_

av1/common/warped_motion.c

diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index 00d24b5..75745e8 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdio.h>

av1/common/warped_motion.h

diff --git a/av1/common/warped_motion.h b/av1/common/warped_motion.h
index 14dc0fe..0ebfaab 100644
--- a/av1/common/warped_motion.h
+++ b/av1/common/warped_motion.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_WARPED_MOTION_H_

av1/common/x86/av1_convolve_horiz_rs_sse4.c

diff --git a/av1/common/x86/av1_convolve_horiz_rs_sse4.c b/av1/common/x86/av1_convolve_horiz_rs_sse4.c
index 8aa1469..eccce8f 100644
--- a/av1/common/x86/av1_convolve_horiz_rs_sse4.c
+++ b/av1/common/x86/av1_convolve_horiz_rs_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/x86/av1_convolve_scale_sse4.c

diff --git a/av1/common/x86/av1_convolve_scale_sse4.c b/av1/common/x86/av1_convolve_scale_sse4.c
index 5d31168..9af9f5a 100644
--- a/av1/common/x86/av1_convolve_scale_sse4.c
+++ b/av1/common/x86/av1_convolve_scale_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/x86/av1_inv_txfm_avx2.c

diff --git a/av1/common/x86/av1_inv_txfm_avx2.c b/av1/common/x86/av1_inv_txfm_avx2.c
index 0fbd5ea..c6d88fa 100644
--- a/av1/common/x86/av1_inv_txfm_avx2.c
+++ b/av1/common/x86/av1_inv_txfm_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/common/x86/av1_inv_txfm_avx2.h

diff --git a/av1/common/x86/av1_inv_txfm_avx2.h b/av1/common/x86/av1_inv_txfm_avx2.h
index f74cbae..bb794ea 100644
--- a/av1/common/x86/av1_inv_txfm_avx2.h
+++ b/av1/common/x86/av1_inv_txfm_avx2.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_X86_AV1_INV_TXFM_AVX2_H_
 #define AOM_AV1_COMMON_X86_AV1_INV_TXFM_AVX2_H_

av1/common/x86/av1_inv_txfm_ssse3.c

diff --git a/av1/common/x86/av1_inv_txfm_ssse3.c b/av1/common/x86/av1_inv_txfm_ssse3.c
index 46c051f..e4fe24e 100644
--- a/av1/common/x86/av1_inv_txfm_ssse3.c
+++ b/av1/common/x86/av1_inv_txfm_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/common/x86/av1_inv_txfm_ssse3.h

diff --git a/av1/common/x86/av1_inv_txfm_ssse3.h b/av1/common/x86/av1_inv_txfm_ssse3.h
index 7d5055d..234060c 100644
--- a/av1/common/x86/av1_inv_txfm_ssse3.h
+++ b/av1/common/x86/av1_inv_txfm_ssse3.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_X86_AV1_INV_TXFM_SSSE3_H_
 #define AOM_AV1_COMMON_X86_AV1_INV_TXFM_SSSE3_H_

av1/common/x86/av1_txfm_sse2.h

diff --git a/av1/common/x86/av1_txfm_sse2.h b/av1/common/x86/av1_txfm_sse2.h
index 77aeb6e..bababcc 100644
--- a/av1/common/x86/av1_txfm_sse2.h
+++ b/av1/common/x86/av1_txfm_sse2.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_COMMON_X86_AV1_TXFM_SSE2_H_
 #define AOM_AV1_COMMON_X86_AV1_TXFM_SSE2_H_

av1/common/x86/av1_txfm_sse4.c

diff --git a/av1/common/x86/av1_txfm_sse4.c b/av1/common/x86/av1_txfm_sse4.c
index 65ccd19..0e97122 100644
--- a/av1/common/x86/av1_txfm_sse4.c
+++ b/av1/common/x86/av1_txfm_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/common/x86/av1_txfm_sse4.h

diff --git a/av1/common/x86/av1_txfm_sse4.h b/av1/common/x86/av1_txfm_sse4.h
index 6cad821..4280488 100644
--- a/av1/common/x86/av1_txfm_sse4.h
+++ b/av1/common/x86/av1_txfm_sse4.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_X86_AV1_TXFM_SSE4_H_

av1/common/x86/cfl_avx2.c

diff --git a/av1/common/x86/cfl_avx2.c b/av1/common/x86/cfl_avx2.c
index 3356984..122d5f9 100644
--- a/av1/common/x86/cfl_avx2.c
+++ b/av1/common/x86/cfl_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <immintrin.h>
 

av1/common/x86/cfl_simd.h

diff --git a/av1/common/x86/cfl_simd.h b/av1/common/x86/cfl_simd.h
index 25ae45b..ae57350 100644
--- a/av1/common/x86/cfl_simd.h
+++ b/av1/common/x86/cfl_simd.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_X86_CFL_SIMD_H_

av1/common/x86/cfl_sse2.c

diff --git a/av1/common/x86/cfl_sse2.c b/av1/common/x86/cfl_sse2.c
index 4783fe0..ac73a6f 100644
--- a/av1/common/x86/cfl_sse2.c
+++ b/av1/common/x86/cfl_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/cfl_ssse3.c

diff --git a/av1/common/x86/cfl_ssse3.c b/av1/common/x86/cfl_ssse3.c
index bbf0072..e9e7091 100644
--- a/av1/common/x86/cfl_ssse3.c
+++ b/av1/common/x86/cfl_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/convolve_2d_avx2.c

diff --git a/av1/common/x86/convolve_2d_avx2.c b/av1/common/x86/convolve_2d_avx2.c
index 211f258..bd84c74 100644
--- a/av1/common/x86/convolve_2d_avx2.c
+++ b/av1/common/x86/convolve_2d_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/convolve_2d_sse2.c

diff --git a/av1/common/x86/convolve_2d_sse2.c b/av1/common/x86/convolve_2d_sse2.c
index a3a8857..e67436d 100644
--- a/av1/common/x86/convolve_2d_sse2.c
+++ b/av1/common/x86/convolve_2d_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/convolve_avx2.c

diff --git a/av1/common/x86/convolve_avx2.c b/av1/common/x86/convolve_avx2.c
index 1a9bf5e..d236d09 100644
--- a/av1/common/x86/convolve_avx2.c
+++ b/av1/common/x86/convolve_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/convolve_sse2.c

diff --git a/av1/common/x86/convolve_sse2.c b/av1/common/x86/convolve_sse2.c
index 7273cde..11a6236 100644
--- a/av1/common/x86/convolve_sse2.c
+++ b/av1/common/x86/convolve_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/filterintra_sse4.c

diff --git a/av1/common/x86/filterintra_sse4.c b/av1/common/x86/filterintra_sse4.c
index c11edc1..8df9f9d 100644
--- a/av1/common/x86/filterintra_sse4.c
+++ b/av1/common/x86/filterintra_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <smmintrin.h>

av1/common/x86/highbd_convolve_2d_avx2.c

diff --git a/av1/common/x86/highbd_convolve_2d_avx2.c b/av1/common/x86/highbd_convolve_2d_avx2.c
index 12d1962..5106b8d 100644
--- a/av1/common/x86/highbd_convolve_2d_avx2.c
+++ b/av1/common/x86/highbd_convolve_2d_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/highbd_convolve_2d_sse4.c

diff --git a/av1/common/x86/highbd_convolve_2d_sse4.c b/av1/common/x86/highbd_convolve_2d_sse4.c
index 185bdd6..b40024d 100644
--- a/av1/common/x86/highbd_convolve_2d_sse4.c
+++ b/av1/common/x86/highbd_convolve_2d_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/highbd_convolve_2d_ssse3.c

diff --git a/av1/common/x86/highbd_convolve_2d_ssse3.c b/av1/common/x86/highbd_convolve_2d_ssse3.c
index 5318fca..c59468a 100644
--- a/av1/common/x86/highbd_convolve_2d_ssse3.c
+++ b/av1/common/x86/highbd_convolve_2d_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/highbd_inv_txfm_avx2.c

diff --git a/av1/common/x86/highbd_inv_txfm_avx2.c b/av1/common/x86/highbd_inv_txfm_avx2.c
index 93e98e4..13dc66c 100644
--- a/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/av1/common/x86/highbd_inv_txfm_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 #include <immintrin.h>

av1/common/x86/highbd_inv_txfm_sse4.c

diff --git a/av1/common/x86/highbd_inv_txfm_sse4.c b/av1/common/x86/highbd_inv_txfm_sse4.c
index 7c32b49..14a260b 100644
--- a/av1/common/x86/highbd_inv_txfm_sse4.c
+++ b/av1/common/x86/highbd_inv_txfm_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 #include <smmintrin.h> /* SSE4.1 */

av1/common/x86/highbd_jnt_convolve_avx2.c

diff --git a/av1/common/x86/highbd_jnt_convolve_avx2.c b/av1/common/x86/highbd_jnt_convolve_avx2.c
index fa27571..d1d01e7 100644
--- a/av1/common/x86/highbd_jnt_convolve_avx2.c
+++ b/av1/common/x86/highbd_jnt_convolve_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/highbd_jnt_convolve_sse4.c

diff --git a/av1/common/x86/highbd_jnt_convolve_sse4.c b/av1/common/x86/highbd_jnt_convolve_sse4.c
index 00ff22f..a897672 100644
--- a/av1/common/x86/highbd_jnt_convolve_sse4.c
+++ b/av1/common/x86/highbd_jnt_convolve_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <smmintrin.h>

av1/common/x86/highbd_txfm_utility_sse4.h

diff --git a/av1/common/x86/highbd_txfm_utility_sse4.h b/av1/common/x86/highbd_txfm_utility_sse4.h
index 5734810..1fe4bc6 100644
--- a/av1/common/x86/highbd_txfm_utility_sse4.h
+++ b/av1/common/x86/highbd_txfm_utility_sse4.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_X86_HIGHBD_TXFM_UTILITY_SSE4_H_

av1/common/x86/highbd_warp_affine_avx2.c

diff --git a/av1/common/x86/highbd_warp_affine_avx2.c b/av1/common/x86/highbd_warp_affine_avx2.c
index 5ba83f0..1b9b858 100644
--- a/av1/common/x86/highbd_warp_affine_avx2.c
+++ b/av1/common/x86/highbd_warp_affine_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <immintrin.h>
 

av1/common/x86/highbd_warp_plane_sse4.c

diff --git a/av1/common/x86/highbd_warp_plane_sse4.c b/av1/common/x86/highbd_warp_plane_sse4.c
index 9e1cc26..723d41b 100644
--- a/av1/common/x86/highbd_warp_plane_sse4.c
+++ b/av1/common/x86/highbd_warp_plane_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <smmintrin.h>

av1/common/x86/highbd_wiener_convolve_avx2.c

diff --git a/av1/common/x86/highbd_wiener_convolve_avx2.c b/av1/common/x86/highbd_wiener_convolve_avx2.c
index 0c8a850..31f4d58 100644
--- a/av1/common/x86/highbd_wiener_convolve_avx2.c
+++ b/av1/common/x86/highbd_wiener_convolve_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/highbd_wiener_convolve_ssse3.c

diff --git a/av1/common/x86/highbd_wiener_convolve_ssse3.c b/av1/common/x86/highbd_wiener_convolve_ssse3.c
index 818b109..df3dade 100644
--- a/av1/common/x86/highbd_wiener_convolve_ssse3.c
+++ b/av1/common/x86/highbd_wiener_convolve_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/intra_edge_sse4.c

diff --git a/av1/common/x86/intra_edge_sse4.c b/av1/common/x86/intra_edge_sse4.c
index fc69f41..90727da 100644
--- a/av1/common/x86/intra_edge_sse4.c
+++ b/av1/common/x86/intra_edge_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/common/x86/jnt_convolve_avx2.c

diff --git a/av1/common/x86/jnt_convolve_avx2.c b/av1/common/x86/jnt_convolve_avx2.c
index c42ebc1..9487923 100644
--- a/av1/common/x86/jnt_convolve_avx2.c
+++ b/av1/common/x86/jnt_convolve_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/jnt_convolve_sse2.c

diff --git a/av1/common/x86/jnt_convolve_sse2.c b/av1/common/x86/jnt_convolve_sse2.c
index 973e225..630f939 100644
--- a/av1/common/x86/jnt_convolve_sse2.c
+++ b/av1/common/x86/jnt_convolve_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/jnt_convolve_ssse3.c

diff --git a/av1/common/x86/jnt_convolve_ssse3.c b/av1/common/x86/jnt_convolve_ssse3.c
index 733f433..202e617 100644
--- a/av1/common/x86/jnt_convolve_ssse3.c
+++ b/av1/common/x86/jnt_convolve_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/reconinter_avx2.c

diff --git a/av1/common/x86/reconinter_avx2.c b/av1/common/x86/reconinter_avx2.c
index a38bd83..0d3e7a9 100644
--- a/av1/common/x86/reconinter_avx2.c
+++ b/av1/common/x86/reconinter_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/reconinter_sse4.c

diff --git a/av1/common/x86/reconinter_sse4.c b/av1/common/x86/reconinter_sse4.c
index 5171ca4..7d17417 100644
--- a/av1/common/x86/reconinter_sse4.c
+++ b/av1/common/x86/reconinter_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>  // SSE2

av1/common/x86/reconinter_ssse3.c

diff --git a/av1/common/x86/reconinter_ssse3.c b/av1/common/x86/reconinter_ssse3.c
index cf68444..cb86d58 100644
--- a/av1/common/x86/reconinter_ssse3.c
+++ b/av1/common/x86/reconinter_ssse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>

av1/common/x86/resize_ssse3.c

diff --git a/av1/common/x86/resize_ssse3.c b/av1/common/x86/resize_ssse3.c
index 0929392..6ab8047 100644
--- a/av1/common/x86/resize_ssse3.c
+++ b/av1/common/x86/resize_ssse3.c
@@ -1,13 +1,13 @@
 /*
  *
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <tmmintrin.h>  // SSSE3

av1/common/x86/selfguided_avx2.c

diff --git a/av1/common/x86/selfguided_avx2.c b/av1/common/x86/selfguided_avx2.c
index 3c5558d..025c7bd 100644
--- a/av1/common/x86/selfguided_avx2.c
+++ b/av1/common/x86/selfguided_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/selfguided_sse4.c

diff --git a/av1/common/x86/selfguided_sse4.c b/av1/common/x86/selfguided_sse4.c
index 72c7708..e9f4ed4 100644
--- a/av1/common/x86/selfguided_sse4.c
+++ b/av1/common/x86/selfguided_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <smmintrin.h>

av1/common/x86/warp_plane_avx2.c

diff --git a/av1/common/x86/warp_plane_avx2.c b/av1/common/x86/warp_plane_avx2.c
index d48f255..246234b 100644
--- a/av1/common/x86/warp_plane_avx2.c
+++ b/av1/common/x86/warp_plane_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/warp_plane_sse2.c

diff --git a/av1/common/x86/warp_plane_sse2.c b/av1/common/x86/warp_plane_sse2.c
index 6ff6665..2cde0ff 100644
--- a/av1/common/x86/warp_plane_sse2.c
+++ b/av1/common/x86/warp_plane_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/warp_plane_sse4.c

diff --git a/av1/common/x86/warp_plane_sse4.c b/av1/common/x86/warp_plane_sse4.c
index ebb6a28..2b80333 100644
--- a/av1/common/x86/warp_plane_sse4.c
+++ b/av1/common/x86/warp_plane_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/common/x86/wiener_convolve_avx2.c

diff --git a/av1/common/x86/wiener_convolve_avx2.c b/av1/common/x86/wiener_convolve_avx2.c
index b7ac683..c2b3e59 100644
--- a/av1/common/x86/wiener_convolve_avx2.c
+++ b/av1/common/x86/wiener_convolve_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/common/x86/wiener_convolve_sse2.c

diff --git a/av1/common/x86/wiener_convolve_sse2.c b/av1/common/x86/wiener_convolve_sse2.c
index f9d00b7..4eedc5a 100644
--- a/av1/common/x86/wiener_convolve_sse2.c
+++ b/av1/common/x86/wiener_convolve_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/decoder/accounting.c

diff --git a/av1/decoder/accounting.c b/av1/decoder/accounting.c
index 2e58d09..d5f6d18 100644
--- a/av1/decoder/accounting.c
+++ b/av1/decoder/accounting.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/decoder/accounting.h

diff --git a/av1/decoder/accounting.h b/av1/decoder/accounting.h
index ad2e8b6..d365fd8 100644
--- a/av1/decoder/accounting.h
+++ b/av1/decoder/accounting.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_DECODER_ACCOUNTING_H_
 #define AOM_AV1_DECODER_ACCOUNTING_H_

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index a2c14b3..8daf6c9 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/decoder/decodeframe.h

diff --git a/av1/decoder/decodeframe.h b/av1/decoder/decodeframe.h
index 6d69453..5591419 100644
--- a/av1/decoder/decodeframe.h
+++ b/av1/decoder/decodeframe.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DECODEFRAME_H_

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 92212ee..57d9acb 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/decoder/decodemv.h

diff --git a/av1/decoder/decodemv.h b/av1/decoder/decodemv.h
index 57e18a6..1b2100a 100644
--- a/av1/decoder/decodemv.h
+++ b/av1/decoder/decodemv.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DECODEMV_H_

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index caf274f..d180af5 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/decoder/decoder.h

diff --git a/av1/decoder/decoder.h b/av1/decoder/decoder.h
index 93bf661..80e349f 100644
--- a/av1/decoder/decoder.h
+++ b/av1/decoder/decoder.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DECODER_H_

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index 2f5c152..a6d0e22 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/decoder/decodetxb.h"

av1/decoder/decodetxb.h

diff --git a/av1/decoder/decodetxb.h b/av1/decoder/decodetxb.h
index fd34d40..a1cbf9c 100644
--- a/av1/decoder/decodetxb.h
+++ b/av1/decoder/decodetxb.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DECODETXB_H_

av1/decoder/detokenize.c

diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 406a6b4..0bf874e 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/decoder/detokenize.h

diff --git a/av1/decoder/detokenize.h b/av1/decoder/detokenize.h
index 173b437..271a7cf 100644
--- a/av1/decoder/detokenize.h
+++ b/av1/decoder/detokenize.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DETOKENIZE_H_

av1/decoder/dthread.h

diff --git a/av1/decoder/dthread.h b/av1/decoder/dthread.h
index f82b9d8..171862e 100644
--- a/av1/decoder/dthread.h
+++ b/av1/decoder/dthread.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_DTHREAD_H_

av1/decoder/inspection.c

diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index 7113d50..12ceb71 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include "av1/decoder/decoder.h"
 #include "av1/decoder/inspection.h"

av1/decoder/inspection.h

diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h
index 9a17254..b5c80c9 100644
--- a/av1/decoder/inspection.h
+++ b/av1/decoder/inspection.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_DECODER_INSPECTION_H_
 #define AOM_AV1_DECODER_INSPECTION_H_

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 963a9e6..fa01e35 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/decoder/obu.h

diff --git a/av1/decoder/obu.h b/av1/decoder/obu.h
index d8ebe36..f4b7058 100644
--- a/av1/decoder/obu.h
+++ b/av1/decoder/obu.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_DECODER_OBU_H_

av1/encoder/aq_complexity.c

diff --git a/av1/encoder/aq_complexity.c b/av1/encoder/aq_complexity.c
index 4a45fc7..a9351c1 100644
--- a/av1/encoder/aq_complexity.c
+++ b/av1/encoder/aq_complexity.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/aq_complexity.h

diff --git a/av1/encoder/aq_complexity.h b/av1/encoder/aq_complexity.h
index 3421d74..03f6fc6 100644
--- a/av1/encoder/aq_complexity.h
+++ b/av1/encoder/aq_complexity.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AQ_COMPLEXITY_H_

av1/encoder/aq_cyclicrefresh.c

diff --git a/av1/encoder/aq_cyclicrefresh.c b/av1/encoder/aq_cyclicrefresh.c
index 5036fbe..74a4cdc 100644
--- a/av1/encoder/aq_cyclicrefresh.c
+++ b/av1/encoder/aq_cyclicrefresh.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/aq_cyclicrefresh.h

diff --git a/av1/encoder/aq_cyclicrefresh.h b/av1/encoder/aq_cyclicrefresh.h
index 93a408a..bfd9be0 100644
--- a/av1/encoder/aq_cyclicrefresh.h
+++ b/av1/encoder/aq_cyclicrefresh.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AQ_CYCLICREFRESH_H_

av1/encoder/aq_variance.c

diff --git a/av1/encoder/aq_variance.c b/av1/encoder/aq_variance.c
index 4479dcb..5d22459 100644
--- a/av1/encoder/aq_variance.c
+++ b/av1/encoder/aq_variance.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/aq_variance.h

diff --git a/av1/encoder/aq_variance.h b/av1/encoder/aq_variance.h
index 543eb0b..88f6f77 100644
--- a/av1/encoder/aq_variance.h
+++ b/av1/encoder/aq_variance.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AQ_VARIANCE_H_

av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c

diff --git a/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c b/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
index b9a314d..66ddbd5 100644
--- a/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
+++ b/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/encodetxb_neon.c

diff --git a/av1/encoder/arm/neon/encodetxb_neon.c b/av1/encoder/arm/neon/encodetxb_neon.c
index 4ededd8..d671574 100644
--- a/av1/encoder/arm/neon/encodetxb_neon.c
+++ b/av1/encoder/arm/neon/encodetxb_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/highbd_fwd_txfm_neon.c

diff --git a/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c b/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c
index e17cd90..d1d7f75 100644
--- a/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c
+++ b/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c

diff --git a/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c b/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c
index 0ad1131..0a952c5 100644
--- a/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c
+++ b/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/ml_neon.c

diff --git a/av1/encoder/arm/neon/ml_neon.c b/av1/encoder/arm/neon/ml_neon.c
index fcff3a9..2c99c5b 100644
--- a/av1/encoder/arm/neon/ml_neon.c
+++ b/av1/encoder/arm/neon/ml_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdbool.h>

av1/encoder/arm/neon/picksrt_neon.c

diff --git a/av1/encoder/arm/neon/picksrt_neon.c b/av1/encoder/arm/neon/picksrt_neon.c
index 34595e8..703b4d2 100644
--- a/av1/encoder/arm/neon/picksrt_neon.c
+++ b/av1/encoder/arm/neon/picksrt_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/quantize_neon.c

diff --git a/av1/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/neon/quantize_neon.c
index 7c41354..bb382ac 100644
--- a/av1/encoder/arm/neon/quantize_neon.c
+++ b/av1/encoder/arm/neon/quantize_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <arm_neon.h>

av1/encoder/arm/neon/rdopt_neon.c

diff --git a/av1/encoder/arm/neon/rdopt_neon.c b/av1/encoder/arm/neon/rdopt_neon.c
index 1786b27..48b1894 100644
--- a/av1/encoder/arm/neon/rdopt_neon.c
+++ b/av1/encoder/arm/neon/rdopt_neon.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/av1_fwd_txfm1d.c

diff --git a/av1/encoder/av1_fwd_txfm1d.c b/av1/encoder/av1_fwd_txfm1d.c
index 6601c19..539a972 100644
--- a/av1/encoder/av1_fwd_txfm1d.c
+++ b/av1/encoder/av1_fwd_txfm1d.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/encoder/av1_fwd_txfm1d.h

diff --git a/av1/encoder/av1_fwd_txfm1d.h b/av1/encoder/av1_fwd_txfm1d.h
index 9ef54fe..9ba01fd 100644
--- a/av1/encoder/av1_fwd_txfm1d.h
+++ b/av1/encoder/av1_fwd_txfm1d.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AV1_FWD_TXFM1D_H_

av1/encoder/av1_fwd_txfm1d_cfg.h

diff --git a/av1/encoder/av1_fwd_txfm1d_cfg.h b/av1/encoder/av1_fwd_txfm1d_cfg.h
index 2777cc2..5ac01ef 100644
--- a/av1/encoder/av1_fwd_txfm1d_cfg.h
+++ b/av1/encoder/av1_fwd_txfm1d_cfg.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AV1_FWD_TXFM1D_CFG_H_

av1/encoder/av1_fwd_txfm2d.c

diff --git a/av1/encoder/av1_fwd_txfm2d.c b/av1/encoder/av1_fwd_txfm2d.c
index 39b0b1c..76e64bb 100644
--- a/av1/encoder/av1_fwd_txfm2d.c
+++ b/av1/encoder/av1_fwd_txfm2d.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/av1_noise_estimate.c

diff --git a/av1/encoder/av1_noise_estimate.c b/av1/encoder/av1_noise_estimate.c
index d1dceaf..6bba29e 100644
--- a/av1/encoder/av1_noise_estimate.c
+++ b/av1/encoder/av1_noise_estimate.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/av1_noise_estimate.h

diff --git a/av1/encoder/av1_noise_estimate.h b/av1/encoder/av1_noise_estimate.h
index 8553066..aa25f4e 100644
--- a/av1/encoder/av1_noise_estimate.h
+++ b/av1/encoder/av1_noise_estimate.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AV1_NOISE_ESTIMATE_H_

av1/encoder/av1_quantize.c

diff --git a/av1/encoder/av1_quantize.c b/av1/encoder/av1_quantize.c
index 3b6d15f..ca6b8fe 100644
--- a/av1/encoder/av1_quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/av1_quantize.h

diff --git a/av1/encoder/av1_quantize.h b/av1/encoder/av1_quantize.h
index 314d4ae..fd215c1 100644
--- a/av1/encoder/av1_quantize.h
+++ b/av1/encoder/av1_quantize.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_AV1_QUANTIZE_H_

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index a9769bb..9d368be 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/bitstream.h

diff --git a/av1/encoder/bitstream.h b/av1/encoder/bitstream.h
index f09960b..59d92a8 100644
--- a/av1/encoder/bitstream.h
+++ b/av1/encoder/bitstream.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_BITSTREAM_H_

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 4bf2617..f87515d 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*! \file

av1/encoder/blockiness.c

diff --git a/av1/encoder/blockiness.c b/av1/encoder/blockiness.c
index f7cff9e..b7821c4 100644
--- a/av1/encoder/blockiness.c
+++ b/av1/encoder/blockiness.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/encoder/cnn.c

diff --git a/av1/encoder/cnn.c b/av1/encoder/cnn.c
index 6b2a55a..5965ceb 100644
--- a/av1/encoder/cnn.c
+++ b/av1/encoder/cnn.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/cnn.h

diff --git a/av1/encoder/cnn.h b/av1/encoder/cnn.h
index 706be44..e13af1c 100644
--- a/av1/encoder/cnn.h
+++ b/av1/encoder/cnn.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_COMMON_CNN_H_

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index f33094d..be6301f 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/pred_common.h"

av1/encoder/compound_type.h

diff --git a/av1/encoder/compound_type.h b/av1/encoder/compound_type.h
index bad0ba8..3ca96df 100644
--- a/av1/encoder/compound_type.h
+++ b/av1/encoder/compound_type.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_COMPOUND_TYPE_H_

av1/encoder/context_tree.c

diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index 6d07ef2..df43849 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/context_tree.h"

av1/encoder/context_tree.h

diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index f243233..b80f855 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_CONTEXT_TREE_H_

av1/encoder/corner_detect.c

diff --git a/av1/encoder/corner_detect.c b/av1/encoder/corner_detect.c
index 597bb30..d07f41e 100644
--- a/av1/encoder/corner_detect.c
+++ b/av1/encoder/corner_detect.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/encoder/corner_detect.h

diff --git a/av1/encoder/corner_detect.h b/av1/encoder/corner_detect.h
index 15062f2..0b06a52 100644
--- a/av1/encoder/corner_detect.h
+++ b/av1/encoder/corner_detect.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_CORNER_DETECT_H_

av1/encoder/corner_match.c

diff --git a/av1/encoder/corner_match.c b/av1/encoder/corner_match.c
index c2f1b2e..88f41af 100644
--- a/av1/encoder/corner_match.c
+++ b/av1/encoder/corner_match.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/encoder/corner_match.h

diff --git a/av1/encoder/corner_match.h b/av1/encoder/corner_match.h
index 45c90f3..f1c5a9d 100644
--- a/av1/encoder/corner_match.h
+++ b/av1/encoder/corner_match.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ENCODER_CORNER_MATCH_H_
 #define AOM_AV1_ENCODER_CORNER_MATCH_H_

av1/encoder/cost.c

diff --git a/av1/encoder/cost.c b/av1/encoder/cost.c
index 323e2ae..10e08a6 100644
--- a/av1/encoder/cost.c
+++ b/av1/encoder/cost.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 

av1/encoder/cost.h

diff --git a/av1/encoder/cost.h b/av1/encoder/cost.h
index be0241a..db22723 100644
--- a/av1/encoder/cost.h
+++ b/av1/encoder/cost.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_COST_H_

av1/encoder/dwt.c

diff --git a/av1/encoder/dwt.c b/av1/encoder/dwt.c
index 04088b2..7bc8307 100644
--- a/av1/encoder/dwt.c
+++ b/av1/encoder/dwt.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/dwt.h

diff --git a/av1/encoder/dwt.h b/av1/encoder/dwt.h
index 37306c6..de6497e 100644
--- a/av1/encoder/dwt.h
+++ b/av1/encoder/dwt.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_DWT_H_

av1/encoder/enc_enums.h

diff --git a/av1/encoder/enc_enums.h b/av1/encoder/enc_enums.h
index 3777d66..05a0039 100644
--- a/av1/encoder/enc_enums.h
+++ b/av1/encoder/enc_enums.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENC_ENUMS_H_

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 8adec1e..fc9f99a 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdint.h>

av1/encoder/encode_strategy.h

diff --git a/av1/encoder/encode_strategy.h b/av1/encoder/encode_strategy.h
index 00c2d39..fb7abec 100644
--- a/av1/encoder/encode_strategy.h
+++ b/av1/encoder/encode_strategy.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index e315998..71449e5 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/encodeframe.h

diff --git a/av1/encoder/encodeframe.h b/av1/encoder/encodeframe.h
index 36b38d5..f9ec850 100644
--- a/av1/encoder/encodeframe.h
+++ b/av1/encoder/encodeframe.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODEFRAME_H_

av1/encoder/encodeframe_utils.c

diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c
index eddfe72..fbd0161 100644
--- a/av1/encoder/encodeframe_utils.c
+++ b/av1/encoder/encodeframe_utils.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_ports/system_state.h"

av1/encoder/encodeframe_utils.h

diff --git a/av1/encoder/encodeframe_utils.h b/av1/encoder/encodeframe_utils.h
index 5fde760..cde7700 100644
--- a/av1/encoder/encodeframe_utils.h
+++ b/av1/encoder/encodeframe_utils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODEFRAME_UTILS_H_

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 4d67ab4..667ec3d 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/encoder/encodemb.h

diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h
index 91b47cc..5ad6a0c 100644
--- a/av1/encoder/encodemb.h
+++ b/av1/encoder/encodemb.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODEMB_H_

av1/encoder/encodemv.c

diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index 4b455eb..c19684f 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/encodemv.h

diff --git a/av1/encoder/encodemv.h b/av1/encoder/encodemv.h
index 45f0fe2..591b964 100644
--- a/av1/encoder/encodemv.h
+++ b/av1/encoder/encodemv.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODEMV_H_

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 64c7a99..7fec4b6 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index a0a293a..a997e6c 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/encoder_alloc.h

diff --git a/av1/encoder/encoder_alloc.h b/av1/encoder/encoder_alloc.h
index b4291d2..5856773 100644
--- a/av1/encoder/encoder_alloc.h
+++ b/av1/encoder/encoder_alloc.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODER_ALLOC_H_

av1/encoder/encoder_utils.c

diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index 5a3466d..626dbc3 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_ports/system_state.h"

av1/encoder/encoder_utils.h

diff --git a/av1/encoder/encoder_utils.h b/av1/encoder/encoder_utils.h
index 60f9096..199d02c 100644
--- a/av1/encoder/encoder_utils.h
+++ b/av1/encoder/encoder_utils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODER_UTILS_H_

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 3bffabd..205bbd1 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/encodetxb.h"

av1/encoder/encodetxb.h

diff --git a/av1/encoder/encodetxb.h b/av1/encoder/encodetxb.h
index 64072b2..a42eace 100644
--- a/av1/encoder/encodetxb.h
+++ b/av1/encoder/encodetxb.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ENCODETXB_H_

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index f19be64..6a888a7 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/warped_motion.h"

av1/encoder/ethread.h

diff --git a/av1/encoder/ethread.h b/av1/encoder/ethread.h
index fae9d10..5fdcd2e 100644
--- a/av1/encoder/ethread.h
+++ b/av1/encoder/ethread.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ETHREAD_H_

av1/encoder/extend.c

diff --git a/av1/encoder/extend.c b/av1/encoder/extend.c
index 381aec8..e376810 100644
--- a/av1/encoder/extend.c
+++ b/av1/encoder/extend.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/aom_dsp_common.h"

av1/encoder/extend.h

diff --git a/av1/encoder/extend.h b/av1/encoder/extend.h
index b8cc5b9..6a09bcf 100644
--- a/av1/encoder/extend.h
+++ b/av1/encoder/extend.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_EXTEND_H_

av1/encoder/firstpass.c

diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 62e520b..d69ce94 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/firstpass.h

diff --git a/av1/encoder/firstpass.h b/av1/encoder/firstpass.h
index e4908f8..797c198 100644
--- a/av1/encoder/firstpass.h
+++ b/av1/encoder/firstpass.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_FIRSTPASS_H_

av1/encoder/global_motion.c

diff --git a/av1/encoder/global_motion.c b/av1/encoder/global_motion.c
index b6e2bc1..dd05332 100644
--- a/av1/encoder/global_motion.c
+++ b/av1/encoder/global_motion.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdio.h>

av1/encoder/global_motion.h

diff --git a/av1/encoder/global_motion.h b/av1/encoder/global_motion.h
index a70bfa8..20f57d2 100644
--- a/av1/encoder/global_motion.h
+++ b/av1/encoder/global_motion.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_GLOBAL_MOTION_H_

av1/encoder/global_motion_facade.c

diff --git a/av1/encoder/global_motion_facade.c b/av1/encoder/global_motion_facade.c
index 4cb4c43..cf70b5b 100644
--- a/av1/encoder/global_motion_facade.c
+++ b/av1/encoder/global_motion_facade.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_dsp/binary_codes_writer.h"

av1/encoder/global_motion_facade.h

diff --git a/av1/encoder/global_motion_facade.h b/av1/encoder/global_motion_facade.h
index 52df19d..2cc9d5b 100644
--- a/av1/encoder/global_motion_facade.h
+++ b/av1/encoder/global_motion_facade.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_GLOBAL_MOTION_FACADE_H_

av1/encoder/gop_structure.c

diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c
index d305553..456d26d 100644
--- a/av1/encoder/gop_structure.c
+++ b/av1/encoder/gop_structure.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdint.h>

av1/encoder/gop_structure.h

diff --git a/av1/encoder/gop_structure.h b/av1/encoder/gop_structure.h
index 6cfca22..53e7a71 100644
--- a/av1/encoder/gop_structure.h
+++ b/av1/encoder/gop_structure.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_GOP_STRUCTURE_H_

av1/encoder/grain_test_vectors.h

diff --git a/av1/encoder/grain_test_vectors.h b/av1/encoder/grain_test_vectors.h
index 945dc37..ec0903a 100644
--- a/av1/encoder/grain_test_vectors.h
+++ b/av1/encoder/grain_test_vectors.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ENCODER_GRAIN_TEST_VECTORS_H_
 #define AOM_AV1_ENCODER_GRAIN_TEST_VECTORS_H_

av1/encoder/hash.c

diff --git a/av1/encoder/hash.c b/av1/encoder/hash.c
index 3091037..5500a41 100644
--- a/av1/encoder/hash.c
+++ b/av1/encoder/hash.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/hash.h"

av1/encoder/hash.h

diff --git a/av1/encoder/hash.h b/av1/encoder/hash.h
index d8e8cc3..2a99ef2 100644
--- a/av1/encoder/hash.h
+++ b/av1/encoder/hash.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_HASH_H_

av1/encoder/hash_motion.c

diff --git a/av1/encoder/hash_motion.c b/av1/encoder/hash_motion.c
index 310cde8..996edc6 100644
--- a/av1/encoder/hash_motion.c
+++ b/av1/encoder/hash_motion.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/hash_motion.h

diff --git a/av1/encoder/hash_motion.h b/av1/encoder/hash_motion.h
index e4ea1f3..33a4cfb 100644
--- a/av1/encoder/hash_motion.h
+++ b/av1/encoder/hash_motion.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_HASH_MOTION_H_

av1/encoder/hybrid_fwd_txfm.c

diff --git a/av1/encoder/hybrid_fwd_txfm.c b/av1/encoder/hybrid_fwd_txfm.c
index 1552f94..44e3a39 100644
--- a/av1/encoder/hybrid_fwd_txfm.c
+++ b/av1/encoder/hybrid_fwd_txfm.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/encoder/hybrid_fwd_txfm.h

diff --git a/av1/encoder/hybrid_fwd_txfm.h b/av1/encoder/hybrid_fwd_txfm.h
index ee82f29..7d74be1 100644
--- a/av1/encoder/hybrid_fwd_txfm.h
+++ b/av1/encoder/hybrid_fwd_txfm.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_HYBRID_FWD_TXFM_H_

av1/encoder/interp_search.c

diff --git a/av1/encoder/interp_search.c b/av1/encoder/interp_search.c
index cad2f35..6029ef5 100644
--- a/av1/encoder/interp_search.c
+++ b/av1/encoder/interp_search.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/pred_common.h"

av1/encoder/interp_search.h

diff --git a/av1/encoder/interp_search.h b/av1/encoder/interp_search.h
index 257205f..2dc1143 100644
--- a/av1/encoder/interp_search.h
+++ b/av1/encoder/interp_search.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_INTERP_FILTER_SEARCH_H_

av1/encoder/intra_mode_search.c

diff --git a/av1/encoder/intra_mode_search.c b/av1/encoder/intra_mode_search.c
index b40def7..1702fca 100644
--- a/av1/encoder/intra_mode_search.c
+++ b/av1/encoder/intra_mode_search.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/reconintra.h"

av1/encoder/intra_mode_search.h

diff --git a/av1/encoder/intra_mode_search.h b/av1/encoder/intra_mode_search.h
index 48ea734..9204cf8 100644
--- a/av1/encoder/intra_mode_search.h
+++ b/av1/encoder/intra_mode_search.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/intra_mode_search_utils.h

diff --git a/av1/encoder/intra_mode_search_utils.h b/av1/encoder/intra_mode_search_utils.h
index 208f9ef..de1b5d1 100644
--- a/av1/encoder/intra_mode_search_utils.h
+++ b/av1/encoder/intra_mode_search_utils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/k_means_template.h

diff --git a/av1/encoder/k_means_template.h b/av1/encoder/k_means_template.h
index 9e526b8..a55cd3f 100644
--- a/av1/encoder/k_means_template.h
+++ b/av1/encoder/k_means_template.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/level.c

diff --git a/av1/encoder/level.c b/av1/encoder/level.c
index a7005a3..01a6b77 100644
--- a/av1/encoder/level.c
+++ b/av1/encoder/level.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_ports/system_state.h"

av1/encoder/level.h

diff --git a/av1/encoder/level.h b/av1/encoder/level.h
index 5e0cce2..2eaa94b 100644
--- a/av1/encoder/level.h
+++ b/av1/encoder/level.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_LEVEL_H_

av1/encoder/lookahead.c

diff --git a/av1/encoder/lookahead.c b/av1/encoder/lookahead.c
index f2bcb27..112d622 100644
--- a/av1/encoder/lookahead.c
+++ b/av1/encoder/lookahead.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 #include <stdlib.h>

av1/encoder/lookahead.h

diff --git a/av1/encoder/lookahead.h b/av1/encoder/lookahead.h
index 8861fd1..573d72b 100644
--- a/av1/encoder/lookahead.h
+++ b/av1/encoder/lookahead.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/mathutils.h

diff --git a/av1/encoder/mathutils.h b/av1/encoder/mathutils.h
index 64f9361..b195140 100644
--- a/av1/encoder/mathutils.h
+++ b/av1/encoder/mathutils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MATHUTILS_H_

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 8601b55..8fd0512 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/mcomp.h

diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index 2519cc8..c612c5d 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MCOMP_H_

av1/encoder/mips/msa/error_msa.c

diff --git a/av1/encoder/mips/msa/error_msa.c b/av1/encoder/mips/msa/error_msa.c
index 2e86dee..9b672c1 100644
--- a/av1/encoder/mips/msa/error_msa.c
+++ b/av1/encoder/mips/msa/error_msa.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/encoder/mips/msa/fdct4x4_msa.c

diff --git a/av1/encoder/mips/msa/fdct4x4_msa.c b/av1/encoder/mips/msa/fdct4x4_msa.c
index 085c08b..ef461ac 100644
--- a/av1/encoder/mips/msa/fdct4x4_msa.c
+++ b/av1/encoder/mips/msa/fdct4x4_msa.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/mips/msa/temporal_filter_msa.c

diff --git a/av1/encoder/mips/msa/temporal_filter_msa.c b/av1/encoder/mips/msa/temporal_filter_msa.c
index effa75b..b3a5e42 100644
--- a/av1/encoder/mips/msa/temporal_filter_msa.c
+++ b/av1/encoder/mips/msa/temporal_filter_msa.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/encoder/misc_model_weights.h

diff --git a/av1/encoder/misc_model_weights.h b/av1/encoder/misc_model_weights.h
index f00aeab..565c598 100644
--- a/av1/encoder/misc_model_weights.h
+++ b/av1/encoder/misc_model_weights.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MISC_MODEL_WEIGHTS_H_

av1/encoder/ml.c

diff --git a/av1/encoder/ml.c b/av1/encoder/ml.c
index 69a0cb4..582589d 100644
--- a/av1/encoder/ml.c
+++ b/av1/encoder/ml.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/ml.h

diff --git a/av1/encoder/ml.h b/av1/encoder/ml.h
index 62d543d..8504d75 100644
--- a/av1/encoder/ml.h
+++ b/av1/encoder/ml.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_ML_H_

av1/encoder/mode_prune_model_weights.h

diff --git a/av1/encoder/mode_prune_model_weights.h b/av1/encoder/mode_prune_model_weights.h
index 98ec368..ff1da2e 100644
--- a/av1/encoder/mode_prune_model_weights.h
+++ b/av1/encoder/mode_prune_model_weights.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MODE_PRUNE_MODEL_WEIGHTS_H_

av1/encoder/model_rd.h

diff --git a/av1/encoder/model_rd.h b/av1/encoder/model_rd.h
index d4d6e4d..f306d49 100644
--- a/av1/encoder/model_rd.h
+++ b/av1/encoder/model_rd.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MODEL_RD_H_

av1/encoder/motion_search_facade.c

diff --git a/av1/encoder/motion_search_facade.c b/av1/encoder/motion_search_facade.c
index ca271ad..26b57a9 100644
--- a/av1/encoder/motion_search_facade.c
+++ b/av1/encoder/motion_search_facade.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_ports/system_state.h"

av1/encoder/motion_search_facade.h

diff --git a/av1/encoder/motion_search_facade.h b/av1/encoder/motion_search_facade.h
index e631c4e..e4f4457 100644
--- a/av1/encoder/motion_search_facade.h
+++ b/av1/encoder/motion_search_facade.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MOTION_SEARCH_H_

av1/encoder/mv_prec.c

diff --git a/av1/encoder/mv_prec.c b/av1/encoder/mv_prec.c
index a923533..3b8221e 100644
--- a/av1/encoder/mv_prec.c
+++ b/av1/encoder/mv_prec.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/aom_config.h"

av1/encoder/mv_prec.h

diff --git a/av1/encoder/mv_prec.h b/av1/encoder/mv_prec.h
index 95ff393..02e60fd 100644
--- a/av1/encoder/mv_prec.h
+++ b/av1/encoder/mv_prec.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_MV_PREC_H_

av1/encoder/optical_flow.c

diff --git a/av1/encoder/optical_flow.c b/av1/encoder/optical_flow.c
index 6360ac8..694645a 100644
--- a/av1/encoder/optical_flow.c
+++ b/av1/encoder/optical_flow.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <math.h>
 #include <limits.h>

av1/encoder/optical_flow.h

diff --git a/av1/encoder/optical_flow.h b/av1/encoder/optical_flow.h
index 5056af3..467d6c5 100644
--- a/av1/encoder/optical_flow.h
+++ b/av1/encoder/optical_flow.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_OPTICAL_FLOW_H_

av1/encoder/palette.c

diff --git a/av1/encoder/palette.c b/av1/encoder/palette.c
index fb483d0..32d2f84 100644
--- a/av1/encoder/palette.c
+++ b/av1/encoder/palette.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/palette.h

diff --git a/av1/encoder/palette.h b/av1/encoder/palette.h
index 0c77aa1..f4a5e5f 100644
--- a/av1/encoder/palette.h
+++ b/av1/encoder/palette.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\file

av1/encoder/partition_cnn_weights.h

diff --git a/av1/encoder/partition_cnn_weights.h b/av1/encoder/partition_cnn_weights.h
index 504038c..ad47840 100644
--- a/av1/encoder/partition_cnn_weights.h
+++ b/av1/encoder/partition_cnn_weights.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PARTITION_CNN_WEIGHTS_H_

av1/encoder/partition_model_weights.h

diff --git a/av1/encoder/partition_model_weights.h b/av1/encoder/partition_model_weights.h
index 71c1ace..c67f421 100644
--- a/av1/encoder/partition_model_weights.h
+++ b/av1/encoder/partition_model_weights.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PARTITION_MODEL_WEIGHTS_H_

av1/encoder/partition_search.c

diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 5a315cb..124e123 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "aom_ports/system_state.h"

av1/encoder/partition_search.h

diff --git a/av1/encoder/partition_search.h b/av1/encoder/partition_search.h
index 9d1aa2d..27f7e6f 100644
--- a/av1/encoder/partition_search.h
+++ b/av1/encoder/partition_search.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PARTITION_SEARCH_H_

av1/encoder/partition_strategy.c

diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index 7499e87..455b484 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <float.h>

av1/encoder/partition_strategy.h

diff --git a/av1/encoder/partition_strategy.h b/av1/encoder/partition_strategy.h
index a386bf9..ef778e4 100644
--- a/av1/encoder/partition_strategy.h
+++ b/av1/encoder/partition_strategy.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PARTITION_STRATEGY_H_

av1/encoder/pass2_strategy.c

diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 6764479..90919dd 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 /*!\defgroup gf_group_algo Golden Frame Group

av1/encoder/pass2_strategy.h

diff --git a/av1/encoder/pass2_strategy.h b/av1/encoder/pass2_strategy.h
index aeca356..1771599 100644
--- a/av1/encoder/pass2_strategy.h
+++ b/av1/encoder/pass2_strategy.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PASS2_STRATEGY_H_

av1/encoder/pickccso.c

diff --git a/av1/encoder/pickccso.c b/av1/encoder/pickccso.c
index 3b90267..ca4f088 100644
--- a/av1/encoder/pickccso.c
+++ b/av1/encoder/pickccso.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/pickccso.h

diff --git a/av1/encoder/pickccso.h b/av1/encoder/pickccso.h
index a4465cc..5513028 100644
--- a/av1/encoder/pickccso.h
+++ b/av1/encoder/pickccso.h
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PICKCCSO_H_

av1/encoder/pickcdef.c

diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index e88cf87..b4fb32f 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/pickcdef.h

diff --git a/av1/encoder/pickcdef.h b/av1/encoder/pickcdef.h
index fc81617..db5f2f6 100644
--- a/av1/encoder/pickcdef.h
+++ b/av1/encoder/pickcdef.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ENCODER_PICKCDEF_H_
 #define AOM_AV1_ENCODER_PICKCDEF_H_

av1/encoder/picklpf.c

diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c
index b715a40..8954a3f 100644
--- a/av1/encoder/picklpf.c
+++ b/av1/encoder/picklpf.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/picklpf.h

diff --git a/av1/encoder/picklpf.h b/av1/encoder/picklpf.h
index 7273355..4668873 100644
--- a/av1/encoder/picklpf.h
+++ b/av1/encoder/picklpf.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PICKLPF_H_

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index bc46945..c578b63 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/pickrst.h

diff --git a/av1/encoder/pickrst.h b/av1/encoder/pickrst.h
index 3c8efe3..30fb3d8 100644
--- a/av1/encoder/pickrst.h
+++ b/av1/encoder/pickrst.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ENCODER_PICKRST_H_
 #define AOM_AV1_ENCODER_PICKRST_H_

av1/encoder/pustats.h

diff --git a/av1/encoder/pustats.h b/av1/encoder/pustats.h
index 2e87101..2633191 100644
--- a/av1/encoder/pustats.h
+++ b/av1/encoder/pustats.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_PUSTATS_H_

av1/encoder/random.h

diff --git a/av1/encoder/random.h b/av1/encoder/random.h
index 0bca391..f00b070 100644
--- a/av1/encoder/random.h
+++ b/av1/encoder/random.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RANDOM_H_

av1/encoder/ransac.c

diff --git a/av1/encoder/ransac.c b/av1/encoder/ransac.c
index 07e1a5f..95a6268 100644
--- a/av1/encoder/ransac.c
+++ b/av1/encoder/ransac.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <memory.h>
 #include <math.h>

av1/encoder/ransac.h

diff --git a/av1/encoder/ransac.h b/av1/encoder/ransac.h
index 583d971..d4a309b 100644
--- a/av1/encoder/ransac.h
+++ b/av1/encoder/ransac.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RANSAC_H_

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index e3d5fe6..cdb3482 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/ratectrl.h

diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index bfaeb94..5919cbd 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RATECTRL_H_

av1/encoder/rc_utils.h

diff --git a/av1/encoder/rc_utils.h b/av1/encoder/rc_utils.h
index 71eb635..02b3ce1 100644
--- a/av1/encoder/rc_utils.h
+++ b/av1/encoder/rc_utils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RC_UTILS_H_

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 0e4e0a0..e3afbe6 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 41c8eec..e0a0eb4 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RD_H_

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 46b5ad1..fb2f268 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/rdopt.h

diff --git a/av1/encoder/rdopt.h b/av1/encoder/rdopt.h
index c9b81f4..8b37bc7 100644
--- a/av1/encoder/rdopt.h
+++ b/av1/encoder/rdopt.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RDOPT_H_

av1/encoder/rdopt_data_defs.h

diff --git a/av1/encoder/rdopt_data_defs.h b/av1/encoder/rdopt_data_defs.h
index 995c213..f45657b 100644
--- a/av1/encoder/rdopt_data_defs.h
+++ b/av1/encoder/rdopt_data_defs.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RDOPT_DATA_DEFS_H_

av1/encoder/rdopt_utils.h

diff --git a/av1/encoder/rdopt_utils.h b/av1/encoder/rdopt_utils.h
index ed44e4a..3ffb81c 100644
--- a/av1/encoder/rdopt_utils.h
+++ b/av1/encoder/rdopt_utils.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RDOPT_UTILS_H_

av1/encoder/reconinter_enc.c

diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index 288ab4c..be727c1 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/reconinter_enc.h

diff --git a/av1/encoder/reconinter_enc.h b/av1/encoder/reconinter_enc.h
index fdc1f31..e52794d 100644
--- a/av1/encoder/reconinter_enc.h
+++ b/av1/encoder/reconinter_enc.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_RECONINTER_ENC_H_

av1/encoder/segmentation.c

diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c
index a240b59..89a2b7f 100644
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/segmentation.h

diff --git a/av1/encoder/segmentation.h b/av1/encoder/segmentation.h
index 1ad13d6..1dad6d4 100644
--- a/av1/encoder/segmentation.h
+++ b/av1/encoder/segmentation.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_SEGMENTATION_H_

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index cc42808..3cb5f45 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <limits.h>

av1/encoder/speed_features.h

diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index d52d2fc..96e8885 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_SPEED_FEATURES_H_

av1/encoder/subgop.c

diff --git a/av1/encoder/subgop.c b/av1/encoder/subgop.c
index 9effaca..d9eb23e 100644
--- a/av1/encoder/subgop.c
+++ b/av1/encoder/subgop.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <ctype.h>

av1/encoder/subgop.h

diff --git a/av1/encoder/subgop.h b/av1/encoder/subgop.h
index e04ffb6..a098afa 100644
--- a/av1/encoder/subgop.h
+++ b/av1/encoder/subgop.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_SUBGOP_H_

av1/encoder/superres_scale.c

diff --git a/av1/encoder/superres_scale.c b/av1/encoder/superres_scale.c
index 1ab260d..1db89b3 100644
--- a/av1/encoder/superres_scale.c
+++ b/av1/encoder/superres_scale.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/encoder_alloc.h"

av1/encoder/superres_scale.h

diff --git a/av1/encoder/superres_scale.h b/av1/encoder/superres_scale.h
index 450a4ed..e51c0fc 100644
--- a/av1/encoder/superres_scale.h
+++ b/av1/encoder/superres_scale.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_SUPERRES_SCALE_H_

av1/encoder/temporal_filter.c

diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 5de5295..aa42f07 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/temporal_filter.h

diff --git a/av1/encoder/temporal_filter.h b/av1/encoder/temporal_filter.h
index f4f07f7..bba993e 100644
--- a/av1/encoder/temporal_filter.h
+++ b/av1/encoder/temporal_filter.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TEMPORAL_FILTER_H_

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 1613bf8..edf10b1 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/tokenize.h

diff --git a/av1/encoder/tokenize.h b/av1/encoder/tokenize.h
index 85bec53..24d4952 100644
--- a/av1/encoder/tokenize.h
+++ b/av1/encoder/tokenize.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TOKENIZE_H_

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index 6a2e5cc..622cc75 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdint.h>

av1/encoder/tpl_model.h

diff --git a/av1/encoder/tpl_model.h b/av1/encoder/tpl_model.h
index 1337a73..b0ebb98 100644
--- a/av1/encoder/tpl_model.h
+++ b/av1/encoder/tpl_model.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TPL_MODEL_H_

av1/encoder/tune_vmaf.c

diff --git a/av1/encoder/tune_vmaf.c b/av1/encoder/tune_vmaf.c
index e6573e3..8d41733 100644
--- a/av1/encoder/tune_vmaf.c
+++ b/av1/encoder/tune_vmaf.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/tune_vmaf.h"

av1/encoder/tune_vmaf.h

diff --git a/av1/encoder/tune_vmaf.h b/av1/encoder/tune_vmaf.h
index c19d5a3..b071bb9 100644
--- a/av1/encoder/tune_vmaf.h
+++ b/av1/encoder/tune_vmaf.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TUNE_VMAF_H_

av1/encoder/tx_prune_model_weights.h

diff --git a/av1/encoder/tx_prune_model_weights.h b/av1/encoder/tx_prune_model_weights.h
index 76efe93..b829223 100644
--- a/av1/encoder/tx_prune_model_weights.h
+++ b/av1/encoder/tx_prune_model_weights.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TX_PRUNE_MODEL_WEIGHTS_H_

av1/encoder/tx_search.c

diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c
index 9b7ae7f..8b001dd 100644
--- a/av1/encoder/tx_search.c
+++ b/av1/encoder/tx_search.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/cfl.h"

av1/encoder/tx_search.h

diff --git a/av1/encoder/tx_search.h b/av1/encoder/tx_search.h
index 5a5d259..64195a7 100644
--- a/av1/encoder/tx_search.h
+++ b/av1/encoder/tx_search.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_TRANSFORM_SEARCH_H_

av1/encoder/use_flat_gop_model_params.h

diff --git a/av1/encoder/use_flat_gop_model_params.h b/av1/encoder/use_flat_gop_model_params.h
index cf07766..33fbcfd 100644
--- a/av1/encoder/use_flat_gop_model_params.h
+++ b/av1/encoder/use_flat_gop_model_params.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_USE_FLAT_GOP_MODEL_PARAMS_H_

av1/encoder/wedge_utils.c

diff --git a/av1/encoder/wedge_utils.c b/av1/encoder/wedge_utils.c
index 4067017..e7af3b9 100644
--- a/av1/encoder/wedge_utils.c
+++ b/av1/encoder/wedge_utils.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/av1_fwd_txfm1d_sse4.c

diff --git a/av1/encoder/x86/av1_fwd_txfm1d_sse4.c b/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
index 62eaa30..03cf0dc 100644
--- a/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
+++ b/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/encoder/x86/av1_txfm1d_sse4.h"

av1/encoder/x86/av1_fwd_txfm2d_avx2.c

diff --git a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
index 634d50b..8a51d0c 100644
--- a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/encoder/x86/av1_fwd_txfm2d_sse4.c

diff --git a/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
index 0bc3fbc..6037230 100644
--- a/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
+++ b/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "config/av1_rtcd.h"

av1/encoder/x86/av1_fwd_txfm_avx2.h

diff --git a/av1/encoder/x86/av1_fwd_txfm_avx2.h b/av1/encoder/x86/av1_fwd_txfm_avx2.h
index aaad76e..1683b61 100644
--- a/av1/encoder/x86/av1_fwd_txfm_avx2.h
+++ b/av1/encoder/x86/av1_fwd_txfm_avx2.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_X86_AV1_FWD_TXFM_AVX2_H_

av1/encoder/x86/av1_fwd_txfm_sse2.c

diff --git a/av1/encoder/x86/av1_fwd_txfm_sse2.c b/av1/encoder/x86/av1_fwd_txfm_sse2.c
index 694e613..beadbaf 100644
--- a/av1/encoder/x86/av1_fwd_txfm_sse2.c
+++ b/av1/encoder/x86/av1_fwd_txfm_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include "av1/common/x86/av1_txfm_sse2.h"

av1/encoder/x86/av1_fwd_txfm_sse2.h

diff --git a/av1/encoder/x86/av1_fwd_txfm_sse2.h b/av1/encoder/x86/av1_fwd_txfm_sse2.h
index a0e32f5..4d1a135 100644
--- a/av1/encoder/x86/av1_fwd_txfm_sse2.h
+++ b/av1/encoder/x86/av1_fwd_txfm_sse2.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #ifndef AOM_AV1_ENCODER_X86_AV1_FWD_TXFM_SSE2_H_
 #define AOM_AV1_ENCODER_X86_AV1_FWD_TXFM_SSE2_H_

av1/encoder/x86/av1_highbd_quantize_avx2.c

diff --git a/av1/encoder/x86/av1_highbd_quantize_avx2.c b/av1/encoder/x86/av1_highbd_quantize_avx2.c
index 5999241..527835f 100644
--- a/av1/encoder/x86/av1_highbd_quantize_avx2.c
+++ b/av1/encoder/x86/av1_highbd_quantize_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/encoder/x86/av1_highbd_quantize_sse4.c

diff --git a/av1/encoder/x86/av1_highbd_quantize_sse4.c b/av1/encoder/x86/av1_highbd_quantize_sse4.c
index bd9af6d..4276ef9 100644
--- a/av1/encoder/x86/av1_highbd_quantize_sse4.c
+++ b/av1/encoder/x86/av1_highbd_quantize_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <smmintrin.h>

av1/encoder/x86/av1_quantize_avx2.c

diff --git a/av1/encoder/x86/av1_quantize_avx2.c b/av1/encoder/x86/av1_quantize_avx2.c
index 4a82bd7..bc4c538 100644
--- a/av1/encoder/x86/av1_quantize_avx2.c
+++ b/av1/encoder/x86/av1_quantize_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/encoder/x86/av1_quantize_sse2.c

diff --git a/av1/encoder/x86/av1_quantize_sse2.c b/av1/encoder/x86/av1_quantize_sse2.c
index 2d2d595..aa8ed1c 100644
--- a/av1/encoder/x86/av1_quantize_sse2.c
+++ b/av1/encoder/x86/av1_quantize_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/encoder/x86/av1_quantize_ssse3_x86_64.asm

diff --git a/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm b/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
index ad4ae27..d5998cd 100644
--- a/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
+++ b/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
@@ -1,12 +1,12 @@
 ;
-; Copyright (c) 2016, Alliance for Open Media. All rights reserved
+; Copyright (c) 2021, Alliance for Open Media. All rights reserved
 ;
-; 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.
+; This source code is subject to the terms of the BSD 3-Clause Clear License and the
+; Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+; not distributed with this source code in the LICENSE file, you can obtain it
+; at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
 ;
 
 ;

av1/encoder/x86/av1_ssim_opt_x86_64.asm

diff --git a/av1/encoder/x86/av1_ssim_opt_x86_64.asm b/av1/encoder/x86/av1_ssim_opt_x86_64.asm
index 6187581..1d993d4 100644
--- a/av1/encoder/x86/av1_ssim_opt_x86_64.asm
+++ b/av1/encoder/x86/av1_ssim_opt_x86_64.asm
@@ -1,12 +1,12 @@
 ;
-; Copyright (c) 2016, Alliance for Open Media. All rights reserved
+; Copyright (c) 2021, Alliance for Open Media. All rights reserved
 ;
-; 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.
+; This source code is subject to the terms of the BSD 3-Clause Clear License and the
+; Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+; not distributed with this source code in the LICENSE file, you can obtain it
+; at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
 ;
 
 ;

av1/encoder/x86/av1_txfm1d_sse4.h

diff --git a/av1/encoder/x86/av1_txfm1d_sse4.h b/av1/encoder/x86/av1_txfm1d_sse4.h
index 7a0f328..b72eae8 100644
--- a/av1/encoder/x86/av1_txfm1d_sse4.h
+++ b/av1/encoder/x86/av1_txfm1d_sse4.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #ifndef AOM_AV1_ENCODER_X86_AV1_TXFM1D_SSE4_H_

av1/encoder/x86/corner_match_avx2.c

diff --git a/av1/encoder/x86/corner_match_avx2.c b/av1/encoder/x86/corner_match_avx2.c
index 8d7eb3f..e403e73 100644
--- a/av1/encoder/x86/corner_match_avx2.c
+++ b/av1/encoder/x86/corner_match_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <math.h>

av1/encoder/x86/corner_match_sse4.c

diff --git a/av1/encoder/x86/corner_match_sse4.c b/av1/encoder/x86/corner_match_sse4.c
index 5c9ca20..bd3ce60 100644
--- a/av1/encoder/x86/corner_match_sse4.c
+++ b/av1/encoder/x86/corner_match_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdlib.h>

av1/encoder/x86/dct_sse2.asm

diff --git a/av1/encoder/x86/dct_sse2.asm b/av1/encoder/x86/dct_sse2.asm
index b185548..fbf2f10 100644
--- a/av1/encoder/x86/dct_sse2.asm
+++ b/av1/encoder/x86/dct_sse2.asm
@@ -1,12 +1,12 @@
 ;
-; Copyright (c) 2016, Alliance for Open Media. All rights reserved
+; Copyright (c) 2021, Alliance for Open Media. All rights reserved
 ;
-; 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.
+; This source code is subject to the terms of the BSD 3-Clause Clear License and the
+; Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+; not distributed with this source code in the LICENSE file, you can obtain it
+; at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
 ;
 
 %define private_prefix av1

av1/encoder/x86/encodetxb_avx2.c

diff --git a/av1/encoder/x86/encodetxb_avx2.c b/av1/encoder/x86/encodetxb_avx2.c
index 30a4129..9918bfe 100644
--- a/av1/encoder/x86/encodetxb_avx2.c
+++ b/av1/encoder/x86/encodetxb_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/encodetxb_sse2.c

diff --git a/av1/encoder/x86/encodetxb_sse2.c b/av1/encoder/x86/encodetxb_sse2.c
index 394befb..48abf02 100644
--- a/av1/encoder/x86/encodetxb_sse2.c
+++ b/av1/encoder/x86/encodetxb_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/encodetxb_sse4.c

diff --git a/av1/encoder/x86/encodetxb_sse4.c b/av1/encoder/x86/encodetxb_sse4.c
index aeb57f2..124040c 100644
--- a/av1/encoder/x86/encodetxb_sse4.c
+++ b/av1/encoder/x86/encodetxb_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/error_intrin_avx2.c

diff --git a/av1/encoder/x86/error_intrin_avx2.c b/av1/encoder/x86/error_intrin_avx2.c
index 12dda3a..38c0711 100644
--- a/av1/encoder/x86/error_intrin_avx2.c
+++ b/av1/encoder/x86/error_intrin_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>  // AVX2

av1/encoder/x86/error_sse2.asm

diff --git a/av1/encoder/x86/error_sse2.asm b/av1/encoder/x86/error_sse2.asm
index f4b4968..2cffb1e 100644
--- a/av1/encoder/x86/error_sse2.asm
+++ b/av1/encoder/x86/error_sse2.asm
@@ -1,12 +1,12 @@
 ;
-; Copyright (c) 2016, Alliance for Open Media. All rights reserved
+; Copyright (c) 2021, Alliance for Open Media. All rights reserved
 ;
-; 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.
+; This source code is subject to the terms of the BSD 3-Clause Clear License and the
+; Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+; not distributed with this source code in the LICENSE file, you can obtain it
+; at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
 ;
 
 ;

av1/encoder/x86/hash_sse42.c

diff --git a/av1/encoder/x86/hash_sse42.c b/av1/encoder/x86/hash_sse42.c
index 0becdf9..e65af60 100644
--- a/av1/encoder/x86/hash_sse42.c
+++ b/av1/encoder/x86/hash_sse42.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdint.h>

av1/encoder/x86/highbd_block_error_intrin_avx2.c

diff --git a/av1/encoder/x86/highbd_block_error_intrin_avx2.c b/av1/encoder/x86/highbd_block_error_intrin_avx2.c
index ee3714d..4b5d7f5 100644
--- a/av1/encoder/x86/highbd_block_error_intrin_avx2.c
+++ b/av1/encoder/x86/highbd_block_error_intrin_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>

av1/encoder/x86/highbd_block_error_intrin_sse2.c

diff --git a/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/av1/encoder/x86/highbd_block_error_intrin_sse2.c
index 4579e4e..43084e2 100644
--- a/av1/encoder/x86/highbd_block_error_intrin_sse2.c
+++ b/av1/encoder/x86/highbd_block_error_intrin_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <emmintrin.h>

av1/encoder/x86/highbd_fwd_txfm_avx2.c

diff --git a/av1/encoder/x86/highbd_fwd_txfm_avx2.c b/av1/encoder/x86/highbd_fwd_txfm_avx2.c
index a81378c..56af02e 100644
--- a/av1/encoder/x86/highbd_fwd_txfm_avx2.c
+++ b/av1/encoder/x86/highbd_fwd_txfm_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 #include <immintrin.h> /*AVX2*/

av1/encoder/x86/highbd_fwd_txfm_sse4.c

diff --git a/av1/encoder/x86/highbd_fwd_txfm_sse4.c b/av1/encoder/x86/highbd_fwd_txfm_sse4.c
index 4aefa3d..f535246 100644
--- a/av1/encoder/x86/highbd_fwd_txfm_sse4.c
+++ b/av1/encoder/x86/highbd_fwd_txfm_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 #include <assert.h>
 #include <smmintrin.h> /* SSE4.1 */

av1/encoder/x86/highbd_temporal_filter_sse2.c

diff --git a/av1/encoder/x86/highbd_temporal_filter_sse2.c b/av1/encoder/x86/highbd_temporal_filter_sse2.c
index af623b8..c449ec1 100644
--- a/av1/encoder/x86/highbd_temporal_filter_sse2.c
+++ b/av1/encoder/x86/highbd_temporal_filter_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/ml_sse3.c

diff --git a/av1/encoder/x86/ml_sse3.c b/av1/encoder/x86/ml_sse3.c
index 89b1e6a..e6d514c 100644
--- a/av1/encoder/x86/ml_sse3.c
+++ b/av1/encoder/x86/ml_sse3.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <stdbool.h>

av1/encoder/x86/pickrst_avx2.c

diff --git a/av1/encoder/x86/pickrst_avx2.c b/av1/encoder/x86/pickrst_avx2.c
index 5f9b5b9..d9ddea5 100644
--- a/av1/encoder/x86/pickrst_avx2.c
+++ b/av1/encoder/x86/pickrst_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <immintrin.h>  // AVX2

av1/encoder/x86/pickrst_sse4.c

diff --git a/av1/encoder/x86/pickrst_sse4.c b/av1/encoder/x86/pickrst_sse4.c
index 43e7182..b9c03f4 100644
--- a/av1/encoder/x86/pickrst_sse4.c
+++ b/av1/encoder/x86/pickrst_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/rdopt_avx2.c

diff --git a/av1/encoder/x86/rdopt_avx2.c b/av1/encoder/x86/rdopt_avx2.c
index fefc036..d7711ee 100644
--- a/av1/encoder/x86/rdopt_avx2.c
+++ b/av1/encoder/x86/rdopt_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/rdopt_sse4.c

diff --git a/av1/encoder/x86/rdopt_sse4.c b/av1/encoder/x86/rdopt_sse4.c
index 67d94b4..1454670 100644
--- a/av1/encoder/x86/rdopt_sse4.c
+++ b/av1/encoder/x86/rdopt_sse4.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/temporal_filter_avx2.c

diff --git a/av1/encoder/x86/temporal_filter_avx2.c b/av1/encoder/x86/temporal_filter_avx2.c
index 5f36737..006b43b 100644
--- a/av1/encoder/x86/temporal_filter_avx2.c
+++ b/av1/encoder/x86/temporal_filter_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/temporal_filter_sse2.c

diff --git a/av1/encoder/x86/temporal_filter_sse2.c b/av1/encoder/x86/temporal_filter_sse2.c
index 9fc92a6..4cfe722 100644
--- a/av1/encoder/x86/temporal_filter_sse2.c
+++ b/av1/encoder/x86/temporal_filter_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/wedge_utils_avx2.c

diff --git a/av1/encoder/x86/wedge_utils_avx2.c b/av1/encoder/x86/wedge_utils_avx2.c
index c06bad8..243e306 100644
--- a/av1/encoder/x86/wedge_utils_avx2.c
+++ b/av1/encoder/x86/wedge_utils_avx2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>

av1/encoder/x86/wedge_utils_sse2.c

diff --git a/av1/encoder/x86/wedge_utils_sse2.c b/av1/encoder/x86/wedge_utils_sse2.c
index f3f4b8a..de93891 100644
--- a/av1/encoder/x86/wedge_utils_sse2.c
+++ b/av1/encoder/x86/wedge_utils_sse2.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
  *
- * 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.
+ * This source code is subject to the terms of the BSD 3-Clause Clear License and the
+ * Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear License was
+ * not distributed with this source code in the LICENSE file, you can obtain it
+ * at aomedia.org/license/software-license/bsd-3-c-c/.  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 aomedia.org/license/patent-license/.
  */
 
 #include <assert.h>