From: Yaowu Xu Date: Mon, 10 Oct 2016 23:21:45 +0000 (-0700) Subject: change to use aomedia copyright notice X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e0d64c5fe2ea54d21f971e35e9194fc92289f82;p=libvpx change to use aomedia copyright notice Change-Id: Idb2cf2555bcbe04a6650c492a3a714d7d5836b67 --- diff --git a/aom_util/aom_util.mk b/aom_util/aom_util.mk index fcf0d709b..14b484a15 100644 --- a/aom_util/aom_util.mk +++ b/aom_util/aom_util.mk @@ -9,6 +9,7 @@ ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## + UTIL_SRCS-yes += aom_util.mk UTIL_SRCS-yes += aom_thread.c UTIL_SRCS-yes += aom_thread.h diff --git a/aom_util/debug_util.c b/aom_util/debug_util.c index 0385df7b7..52389d072 100644 --- a/aom_util/debug_util.c +++ b/aom_util/debug_util.c @@ -1,17 +1,17 @@ /* - * Copyright (c) 2016 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #include #include #include "aom_util/debug_util.h" - #define QUEUE_MAX_SIZE 2000000 static int result_queue[QUEUE_MAX_SIZE]; static int prob_queue[QUEUE_MAX_SIZE]; diff --git a/aom_util/debug_util.h b/aom_util/debug_util.h index 7c2299aa8..c52e38535 100644 --- a/aom_util/debug_util.h +++ b/aom_util/debug_util.h @@ -1,11 +1,12 @@ /* - * Copyright (c) 2016 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #ifndef AOM_UTIL_DEBUG_UTIL_H_ diff --git a/examples/lossless_encoder.c b/examples/lossless_encoder.c index 7676226c3..069e35e32 100644 --- a/examples/lossless_encoder.c +++ b/examples/lossless_encoder.c @@ -1,11 +1,12 @@ /* - * Copyright (c) 2014 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #include