Change to use aom copyright notice

This minimize code differences between AOM master and nextgenv2

Change-Id: If144865bdf3ef0818e7aac11018b9e786444c550

AUTHORS

@@ -142,6 +142,3 @@ Yaowu Xu <yaowu@google.com>
 Yongzhe Wang <yongzhe@google.com>
 Yunqing Wang <yunqingwang@google.com>
 Zoe Liu <zoeliu@google.com>
-Google Inc.
-The Mozilla Foundation
-The Xiph.Org Foundation

CHANGELOG

@@ -2,52 +2,54 @@ Next Release
   - Incompatible changes:
     The AV1 encoder's default keyframe interval changed to 128 from 9999.
 
+2016-04-07 v0.1.0 "AOMedia Codec 1"
+  This release is the first Alliance for Open Media codec.
 2015-11-09 v1.5.0 "Javan Whistling Duck"
-  This release improves upon the AV1 encoder and speeds up the encoding and
+  This release improves upon the VP9 encoder and speeds up the encoding and
   decoding processes.
 
   - Upgrading:
     This release is ABI incompatible with 1.4.0. It drops deprecated VP8
-    controls and adds a variety of AV1 controls for testing.
+    controls and adds a variety of VP9 controls for testing.
 
-    The aomenc utility now prefers AV1 by default.
+    The vpxenc utility now prefers VP9 by default.
 
   - Enhancements:
-    Faster AV1 encoding and decoding
-    Smaller library size by combining functions used by VP8 and AV1
+    Faster VP9 encoding and decoding
+    Smaller library size by combining functions used by VP8 and VP9
 
   - Bug Fixes:
     A variety of fuzzing issues
 
 2015-04-03 v1.4.0 "Indian Runner Duck"
-  This release includes significant improvements to the AV1 codec.
+  This release includes significant improvements to the VP9 codec.
 
   - Upgrading:
     This release is ABI incompatible with 1.3.0. It drops the compatibility
     layer, requiring VPX_IMG_FMT_* instead of IMG_FMT_*, and adds several codec
-    controls for AV1.
+    controls for VP9.
 
   - Enhancements:
-    Faster AV1 encoding and decoding
-    Multithreaded AV1 decoding (tile and frame-based)
-    Multithreaded AV1 encoding - on by default
-    YUV 4:2:2 and 4:4:4 support in AV1
-    10 and 12bit support in AV1
+    Faster VP9 encoding and decoding
+    Multithreaded VP9 decoding (tile and frame-based)
+    Multithreaded VP9 encoding - on by default
+    YUV 4:2:2 and 4:4:4 support in VP9
+    10 and 12bit support in VP9
     64bit ARM support by replacing ARM assembly with intrinsics
 
   - Bug Fixes:
-    Fixes a AV1 bitstream issue in Profile 1. This only affected non-YUV 4:2:0
+    Fixes a VP9 bitstream issue in Profile 1. This only affected non-YUV 4:2:0
     files.
 
   - Known Issues:
     Frame Parallel decoding fails for segmented and non-420 files.
 
 2013-11-15 v1.3.0 "Forest"
-  This release introduces the AV1 codec in a backward-compatible way.
+  This release introduces the VP9 codec in a backward-compatible way.
   All existing users of VP8 can continue to use the library without
-  modification. However, some VP8 options do not map to AV1 in the same manner.
+  modification. However, some VP8 options do not map to VP9 in the same manner.
 
-  The AV1 encoder in this release is not feature complete. Users interested in
+  The VP9 encoder in this release is not feature complete. Users interested in
   the encoder are advised to use the git master branch and discuss issues on
   libvpx mailing lists.
 
@@ -68,11 +70,11 @@ Next Release
       configure: support mingw-w64
       configure: support hardfloat armv7 CHOSTS
       configure: add support for android x86
-      Add estimated completion time to aomenc
-      Don't exit on decode errors in aomenc
-      aomenc: support scaling prior to encoding
-      aomdec: support scaling output
-      aomenc: improve progress indicators with --skip
+      Add estimated completion time to vpxenc
+      Don't exit on decode errors in vpxenc
+      vpxenc: support scaling prior to encoding
+      vpxdec: support scaling output
+      vpxenc: improve progress indicators with --skip
       msvs: Don't link to winmm.lib
       Add a new script for producing vcxproj files
       Produce Visual Studio 10 and 11 project files
@@ -82,7 +84,7 @@ Next Release
       Add encoding option --static-thresh
 
   - Speed:
-      Miscellaneous speed optimizations for VP8 and AV1.
+      Miscellaneous speed optimizations for VP8 and VP9.
 
   - Quality:
       In general, quality is consistent with the Eider release.
@@ -104,7 +106,7 @@ Next Release
 
   - Enhancements:
       VP8 optimizations for MIPS dspr2
-      aomenc: add -quiet option
+      vpxenc: add -quiet option
 
   - Speed:
       Encoder and decoder speed is consistent with the Eider release.
@@ -159,17 +161,17 @@ Next Release
         OS/2 support
         SunCC support
 
-      Changing resolution with aom_codec_enc_config_set() is now
+      Changing resolution with vpx_codec_enc_config_set() is now
       supported. Previously, reinitializing the codec was required to
       change the input resolution.
 
-      The aomenc application has initial support for producing multiple
+      The vpxenc application has initial support for producing multiple
       encodes from the same input in one call. Resizing is not yet
       supported, but varying other codec parameters is. Use -- to
       delineate output streams. Options persist from one stream to the
       next.
 
-      Also, the aomenc application will now use a keyframe interval of
+      Also, the vpxenc application will now use a keyframe interval of
       5 seconds by default. Use the --kf-max-dist option to override.
 
   - Speed:
@@ -206,7 +208,7 @@ Next Release
       enhancement (MFQE) in sections of the frame where there is motion.
       (#392)
 
-      Fixed corruption issues when aom_codec_enc_config_set() was called
+      Fixed corruption issues when vpx_codec_enc_config_set() was called
       with spatial resampling enabled.
 
       Fixed a decoder error introduced in Duclair where the segmentation
@@ -300,12 +302,12 @@ Next Release
     notes in this document for that release.
 
   - Enhancements:
-          Stereo 3D format support for aomenc
+          Stereo 3D format support for vpxenc
           Runtime detection of available processor cores.
           Allow specifying --end-usage by enum name
-          aomdec: test for frame corruption
-          aomenc: add quantizer histogram display
-          aomenc: add rate histogram display
+          vpxdec: test for frame corruption
+          vpxenc: add quantizer histogram display
+          vpxenc: add rate histogram display
           Set VPX_FRAME_IS_DROPPABLE
           update configure for ios sdk 4.3
           Avoid text relocations in ARM vp8 decoder
@@ -370,7 +372,7 @@ Next Release
           Fix semaphore emulation, spin-wait intrinsics on Windows
           Fix build with xcode4 and simplify GLOBAL.
           Mark ARM asm objects as allowing a non-executable stack.
-          Fix aomenc encoding incorrect webm file header on big endian
+          Fix vpxenc encoding incorrect webm file header on big endian
 
 
 2011-03-07 v0.9.6 "Bali"
@@ -382,7 +384,7 @@ Next Release
     document for that release.
 
   - Enhancements:
-      aomenc --psnr shows a summary when encode completes
+      vpxenc --psnr shows a summary when encode completes
       --tune=ssim option to enable activity masking
       improved postproc visualizations for development
       updated support for Apple iOS to SDK 4.2
@@ -455,9 +457,9 @@ Next Release
 
   - Upgrading:
     This release incorporates backwards-incompatible changes to the
-    ivfenc and ivfdec tools. These tools are now called aomenc and aomdec.
+    ivfenc and ivfdec tools. These tools are now called vpxenc and vpxdec.
 
-    aomdec
+    vpxdec
       * the -q (quiet) option has been removed, and replaced with
         -v (verbose). the output is quiet by default. Use -v to see
         the version number of the binary.
@@ -470,13 +472,13 @@ Next Release
         options must be specified.
 
           $ ivfdec -o OUTPUT INPUT
-          $ aomdec --i420 -o OUTPUT INPUT
+          $ vpxdec --i420 -o OUTPUT INPUT
 
       * If an output file is not specified, the default is to write
         Y4M to stdout. This makes piping more natural.
 
           $ ivfdec -y -o - INPUT | ...
-          $ aomdec INPUT | ...
+          $ vpxdec INPUT | ...
 
       * The output file has additional flexibility for formatting the
         filename. It supports escape characters for constructing a
@@ -484,33 +486,33 @@ Next Release
         replaces the -p option. To get the equivalent:
 
           $ ivfdec -p frame INPUT
-          $ aomdec --i420 -o frame-%wx%h-%4.i420 INPUT
+          $ vpxdec --i420 -o frame-%wx%h-%4.i420 INPUT
 
-    aomenc
+    vpxenc
       * The output file must be specified with -o, rather than as the
         last argument.
 
           $ ivfenc <options> INPUT OUTPUT
-          $ aomenc <options> -o OUTPUT INPUT
+          $ vpxenc <options> -o OUTPUT INPUT
 
       * The output defaults to webm. To get IVF output, use the --ivf
         option.
 
           $ ivfenc <options> INPUT OUTPUT.ivf
-          $ aomenc <options> -o OUTPUT.ivf --ivf INPUT
+          $ vpxenc <options> -o OUTPUT.ivf --ivf INPUT
 
 
   - Enhancements:
-      ivfenc and ivfdec have been renamed to aomenc, aomdec.
-      aomdec supports .webm input
-      aomdec writes .y4m by default
-      aomenc writes .webm output by default
-      aomenc --psnr now shows the average/overall PSNR at the end
+      ivfenc and ivfdec have been renamed to vpxenc, vpxdec.
+      vpxdec supports .webm input
+      vpxdec writes .y4m by default
+      vpxenc writes .webm output by default
+      vpxenc --psnr now shows the average/overall PSNR at the end
       ARM platforms now support runtime cpu detection
-      aomdec visualizations added for motion vectors, block modes, references
-      aomdec now silent by default
-      aomdec --progress shows frame-by-frame timing information
-      aomenc supports the distinction between --fps and --timebase
+      vpxdec visualizations added for motion vectors, block modes, references
+      vpxdec now silent by default
+      vpxdec --progress shows frame-by-frame timing information
+      vpxenc supports the distinction between --fps and --timebase
       NASM is now a supported assembler
       configure: enable PIC for shared libs by default
       configure: add --enable-small

aom/aom.h

 /*
- *  Copyright (c) 2010 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.
  */
 
 /*!\defgroup aom AOM

aom/aom_codec.h

 /*
- *  Copyright (c) 2010 The WebM project authors. 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.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
 /*!\defgroup codec Common Algorithm Interface

aom/aom_codec.mk

 ##
-##  Copyright (c) 2010 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.
 ##
 
 

aom/aom_decoder.h

 /*
- *  Copyright (c) 2010 The WebM project authors. 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.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent 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_AOM_DECODER_H_
 #define AOM_AOM_DECODER_H_

aom/aom_encoder.h

 /*
- *  Copyright (c) 2010 The WebM project authors. 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.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent 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_AOM_ENCODER_H_
 #define AOM_AOM_ENCODER_H_

aom/aom_frame_buffer.h

 /*
- *  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.
  */
 
 #ifndef AOM_AOM_FRAME_BUFFER_H_

aom/aom_image.h

 /*
- *  Copyright (c) 2010 The WebM project authors. 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.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
 /*!\file

aom/aom_integer.h

 /*
- *  Copyright (c) 2010 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_AOM_INTEGER_H_

aom/aomcx.h

 /*
- *  Copyright (c) 2010 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_AOMCX_H_
 #define AOM_AOMCX_H_
 
-/*!\defgroup vp8_encoder WebM VP8/AV1 Encoder
- * \ingroup vp8
+/*!\defgroup aom_encoder AOMedia AOM/AV1 Encoder
+ * \ingroup aom
  *
  * @{
  */
@@ -19,7 +20,7 @@
 #include "./aom_encoder.h"
 
 /*!\file
- * \brief Provides definitions for using VP8 or AV1 encoder algorithm within the
+ * \brief Provides definitions for using AOM or AV1 encoder algorithm within the
  *        aom Codec Interface.
  */
 

aom/aomdx.h

 /*
- *  Copyright (c) 2010 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.
  */
 
 /*!\defgroup aom_decoder AOMedia AOM/AV1 Decoder

aom/internal/aom_codec_internal.h

 /*
- *  Copyright (c) 2010 The WebM project authors. 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.
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
 /*!\file

aom/src/aom_codec.c

 /*
- *  Copyright (c) 2010 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.
  */
 
 /*!\file

aom/src/aom_decoder.c

 /*
- *  Copyright (c) 2010 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.
  */
 
 /*!\file

aom/src/aom_encoder.c

 /*
- *  Copyright (c) 2010 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.
  */
 
 /*!\file

aom/src/aom_image.c

 /*
- *  Copyright (c) 2010 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 <stdlib.h>

aom_dsp/aom_convolve.c

 /*
- *  Copyright (c) 2013 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 <assert.h>

aom_dsp/aom_convolve.h

 /*
- *  Copyright (c) 2013 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_DSP_AOM_CONVOLVE_H_
 #define AOM_DSP_AOM_CONVOLVE_H_

aom_dsp/aom_dsp.mk

 ##
-## Copyright (c) 2015 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.
 ##
 
 DSP_SRCS-yes += aom_dsp.mk