Commit 55f5d91f authored by Frank Barchard's avatar Frank Barchard Committed by Commit Bot

Disable old int types by default.

Legacy types can cause build errors with code that defines
them differently.  Disable them by default.  Allow the types
to be enabled with #define LIBYUV_LEGACY_TYPES

BUG=libyuv:808
TESTED=libyuv try bots still build

Change-Id: I48928329393f44a377cec781e645570b14569668
Reviewed-on: https://chromium-review.googlesource.com/1129558
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
Reviewed-by: 's avatarFrank Barchard <fbarchard@chromium.org>
parent 9ac881f4
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1713 Version: 1714
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -29,6 +29,8 @@ typedef signed char int8_t; ...@@ -29,6 +29,8 @@ typedef signed char int8_t;
#else #else
#include <stdint.h> // for uintptr_t and C99 types #include <stdint.h> // for uintptr_t and C99 types
#endif // defined(_MSC_VER) && (_MSC_VER < 1600) #endif // defined(_MSC_VER) && (_MSC_VER < 1600)
// Types are deprecated. Enable this macro for legacy types.
#ifdef LIBYUV_LEGACY_TYPES
typedef uint64_t uint64; typedef uint64_t uint64;
typedef int64_t int64; typedef int64_t int64;
typedef uint32_t uint32; typedef uint32_t uint32;
...@@ -37,6 +39,7 @@ typedef uint16_t uint16; ...@@ -37,6 +39,7 @@ typedef uint16_t uint16;
typedef int16_t int16; typedef int16_t int16;
typedef uint8_t uint8; typedef uint8_t uint8;
typedef int8_t int8; typedef int8_t int8;
#endif // LIBYUV_LEGACY_TYPES
#endif // INT_TYPES_DEFINED #endif // INT_TYPES_DEFINED
#if !defined(LIBYUV_API) #if !defined(LIBYUV_API)
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1713 #define LIBYUV_VERSION 1714
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -319,12 +319,12 @@ int YUVToARGBScaleReference2(const uint8_t* src_y, ...@@ -319,12 +319,12 @@ int YUVToARGBScaleReference2(const uint8_t* src_y,
int src_stride_u, int src_stride_u,
const uint8_t* src_v, const uint8_t* src_v,
int src_stride_v, int src_stride_v,
uint32 /* src_fourcc */, uint32_t /* src_fourcc */,
int src_width, int src_width,
int src_height, int src_height,
uint8_t* dst_argb, uint8_t* dst_argb,
int dst_stride_argb, int dst_stride_argb,
uint32 /* dst_fourcc */, uint32_t /* dst_fourcc */,
int dst_width, int dst_width,
int dst_height, int dst_height,
int clip_x, int clip_x,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment