summaryrefslogtreecommitdiff
path: root/drivers/webp/utils/bit_writer.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-02-10 22:37:07 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-02-10 22:37:07 -0300
commitabb985e755ccf858149294868eff8a9a9feca67e (patch)
tree2a82fd9f87ddecfb14b08d8599bb2417b3cea7ff /drivers/webp/utils/bit_writer.h
parent1c7726820ec53b486e946bb42cac98a600c5bdb5 (diff)
Reverted to older version of WebP, newer one crashed on Android.
Diffstat (limited to 'drivers/webp/utils/bit_writer.h')
-rw-r--r--drivers/webp/utils/bit_writer.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/webp/utils/bit_writer.h b/drivers/webp/utils/bit_writer.h
index 89a9ead488..f7ca08497f 100644
--- a/drivers/webp/utils/bit_writer.h
+++ b/drivers/webp/utils/bit_writer.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/
// -----------------------------------------------------------------------------
//
// Bit writing and boolean coder
@@ -16,7 +14,7 @@
#include "../webp/types.h"
-#ifdef __cplusplus
+#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
@@ -118,7 +116,7 @@ void VP8LWriteBits(VP8LBitWriter* const bw, int n_bits, uint32_t bits);
//------------------------------------------------------------------------------
-#ifdef __cplusplus
+#if defined(__cplusplus) || defined(c_plusplus)
} // extern "C"
#endif