diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-11-05 12:30:33 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-11-05 12:30:33 -0400 |
| commit | 7a590c902b9a77d9792d3a2497d28302eb0e0834 (patch) | |
| tree | b1f735eee5d5a6fbc633b11eecf90dc47f8d7e42 /vp8/common/fourcc.hpp | |
| parent | f4020e2338a1786b1db0f67075ceb7d9c01be6a3 (diff) | |
| parent | 5551ef0ef4fd3271330fa5a2fbdfe70d4d2a1d2e (diff) | |
| download | libvpx-7a590c902b9a77d9792d3a2497d28302eb0e0834.tar libvpx-7a590c902b9a77d9792d3a2497d28302eb0e0834.tar.gz libvpx-7a590c902b9a77d9792d3a2497d28302eb0e0834.tar.bz2 libvpx-7a590c902b9a77d9792d3a2497d28302eb0e0834.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
configure
ivfenc.c
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
Diffstat (limited to 'vp8/common/fourcc.hpp')
| -rw-r--r-- | vp8/common/fourcc.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vp8/common/fourcc.hpp b/vp8/common/fourcc.hpp index 5f1faed2f..c5826285e 100644 --- a/vp8/common/fourcc.hpp +++ b/vp8/common/fourcc.hpp @@ -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. */ |