generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "change to use aomedia copyright notice" into nextgenv2

Browse Source
This commit is contained in:
Yaowu Xu
2016-10-11 22:11:09 +00:00
committed by Gerrit Code Review
parent 058ec6cd56 6e0d64c5fe
commit 4a01dca3c6
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aom_util/aom_util.mk
View File

@@ -9,6 +9,7 @@
## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
UTIL_SRCS-yes += aom_util.mk UTIL_SRCS-yes += aom_util.mk
UTIL_SRCS-yes += aom_thread.c UTIL_SRCS-yes += aom_thread.c
UTIL_SRCS-yes += aom_thread.h UTIL_SRCS-yes += aom_thread.h

14
aom_util/debug_util.c
View File

@@ -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 * This source code is subject to the terms of the BSD 2 Clause License and
* that can be found in the LICENSE file in the root of the source * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
* tree. An additional intellectual property rights grant can be found * was not distributed with this source code in the LICENSE file, you can
* in the file PATENTS. All contributing project authors may * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* be found in the AUTHORS file in the root of the source tree. * Media Patent 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 <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "aom_util/debug_util.h" #include "aom_util/debug_util.h"
#define QUEUE_MAX_SIZE 2000000 #define QUEUE_MAX_SIZE 2000000
static int result_queue[QUEUE_MAX_SIZE]; static int result_queue[QUEUE_MAX_SIZE];
static int prob_queue[QUEUE_MAX_SIZE]; static int prob_queue[QUEUE_MAX_SIZE];

13
aom_util/debug_util.h
View File

@@ -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 * This source code is subject to the terms of the BSD 2 Clause License and
* that can be found in the LICENSE file in the root of the source * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
* tree. An additional intellectual property rights grant can be found * was not distributed with this source code in the LICENSE file, you can
* in the file PATENTS. All contributing project authors may * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* be found in the AUTHORS file in the root of the source tree. * Media Patent 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_ #ifndef AOM_UTIL_DEBUG_UTIL_H_

13
examples/lossless_encoder.c
View File

@@ -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 * This source code is subject to the terms of the BSD 2 Clause License and
* that can be found in the LICENSE file in the root of the source * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
* tree. An additional intellectual property rights grant can be found * was not distributed with this source code in the LICENSE file, you can
* in the file PATENTS. All contributing project authors may * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* be found in the AUTHORS file in the root of the source tree. * Media Patent 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 <stdio.h> #include <stdio.h>