diff options
| author | Suman Sunkara <sunkaras@google.com> | 2010-11-16 15:09:26 -0500 |
|---|---|---|
| committer | Suman Sunkara <sunkaras@google.com> | 2010-11-16 16:30:59 -0500 |
| commit | 4b3f72001de952aaf3874d3ce2dca3cb3fbe3928 (patch) | |
| tree | 754d87a4fa5cae908388f0a26b2affad7cd8a523 /build/make/obj_int_extract.c | |
| parent | b9a18344cf8e5283928525c5ac0897ede79f9e57 (diff) | |
| parent | 00fe7441e9c5cbd898a8382d49cf9396d8482464 (diff) | |
| download | libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.gz libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.bz2 libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.zip | |
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/demode.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
Change-Id: Ic379f4dffaded9796dc19d56be304d3f8527c61f
Diffstat (limited to 'build/make/obj_int_extract.c')
| -rw-r--r-- | build/make/obj_int_extract.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build/make/obj_int_extract.c b/build/make/obj_int_extract.c index d9afb9d30..e01870f27 100644 --- a/build/make/obj_int_extract.c +++ b/build/make/obj_int_extract.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * 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. */ |