diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
| commit | abb985e755ccf858149294868eff8a9a9feca67e (patch) | |
| tree | 2a82fd9f87ddecfb14b08d8599bb2417b3cea7ff /drivers/webp/utils/huffman_encode.h | |
| parent | 1c7726820ec53b486e946bb42cac98a600c5bdb5 (diff) | |
| download | redot-engine-abb985e755ccf858149294868eff8a9a9feca67e.tar.gz | |
Reverted to older version of WebP, newer one crashed on Android.
Diffstat (limited to 'drivers/webp/utils/huffman_encode.h')
| -rw-r--r-- | drivers/webp/utils/huffman_encode.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/webp/utils/huffman_encode.h b/drivers/webp/utils/huffman_encode.h index ee51c68c9f..cc3b38d330 100644 --- a/drivers/webp/utils/huffman_encode.h +++ b/drivers/webp/utils/huffman_encode.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/ // ----------------------------------------------------------------------------- // // Author: Jyrki Alakuijala (jyrki@google.com) @@ -16,7 +14,7 @@ #include "../webp/types.h" -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif @@ -42,7 +40,7 @@ int VP8LCreateCompressedHuffmanTree(const HuffmanTreeCode* const tree, int VP8LCreateHuffmanTree(int* const histogram, int tree_depth_limit, HuffmanTreeCode* const tree); -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) } #endif |