diff options
| author | bwzuk <ben.potton@gmail.com> | 2014-02-11 12:53:33 +0000 |
|---|---|---|
| committer | bwzuk <ben.potton@gmail.com> | 2014-02-11 12:53:33 +0000 |
| commit | ef80fffd197e2d03b7bddd3f8da1272452357c6c (patch) | |
| tree | 58bf7a95a580b6705c92cc1d35418d9aa262dfb8 /drivers/webp/enc/cost.h | |
| parent | 5a65a6cb2b9134fbdd6e39fe3106b7a90df0cb1b (diff) | |
| parent | abb985e755ccf858149294868eff8a9a9feca67e (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/webp/enc/cost.h')
| -rw-r--r-- | drivers/webp/enc/cost.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/webp/enc/cost.h b/drivers/webp/enc/cost.h index 3cbad1ae4c..09b75b699d 100644 --- a/drivers/webp/enc/cost.h +++ b/drivers/webp/enc/cost.h @@ -1,10 +1,8 @@ // Copyright 2011 Google Inc. All Rights Reserved. // -// Use of this source code is governed by a BSD-style license -// that can be found in the COPYING 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 code is licensed under the same terms as WebM: +// Software License Agreement: http://www.webmproject.org/license/software/ +// Additional IP Rights Grant: http://www.webmproject.org/license/additional/ // ----------------------------------------------------------------------------- // // Cost tables for level and modes. @@ -16,12 +14,11 @@ #include "./vp8enci.h" -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -// approximate cost per level: -extern const uint16_t VP8LevelFixedCosts[MAX_LEVEL + 1]; +extern const uint16_t VP8LevelFixedCosts[2048]; // approximate cost per level extern const uint16_t VP8EntropyCost[256]; // 8bit fixed-point log(p) // Cost of coding one event with probability 'proba'. @@ -44,7 +41,7 @@ extern const uint16_t VP8FixedCostsI4[NUM_BMODES][NUM_BMODES][NUM_BMODES]; //------------------------------------------------------------------------------ -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) } // extern "C" #endif |