From abb985e755ccf858149294868eff8a9a9feca67e Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 10 Feb 2014 22:37:07 -0300 Subject: Reverted to older version of WebP, newer one crashed on Android. --- drivers/webp/dec/buffer.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'drivers/webp/dec/buffer.c') diff --git a/drivers/webp/dec/buffer.c b/drivers/webp/dec/buffer.c index 1e852efe74..c159f6f248 100644 --- a/drivers/webp/dec/buffer.c +++ b/drivers/webp/dec/buffer.c @@ -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/ // ----------------------------------------------------------------------------- // // Everything about WebPDecBuffer @@ -17,6 +15,10 @@ #include "./webpi.h" #include "../utils/utils.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + //------------------------------------------------------------------------------ // WebPDecBuffer @@ -208,3 +210,6 @@ void WebPGrabDecBuffer(WebPDecBuffer* const src, WebPDecBuffer* const dst) { //------------------------------------------------------------------------------ +#if defined(__cplusplus) || defined(c_plusplus) +} // extern "C" +#endif -- cgit v1.2.3