mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-01-01 03:12:16 +08:00
Remove HAVE_JPEG requirement from headers.
JPeg is currently only enabled on Windows and Linux builds, so only call the functions if needed and available for your target platform. Bug: b/152178870 Change-Id: I99082d2d6b1440b26c4fe6840dfafe6fc9b1df9d Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2115190 Reviewed-by: Hsiu Wang <hsiu@google.com> Reviewed-by: Frank Barchard <fbarchard@chromium.org> Commit-Queue: Frank Barchard <fbarchard@chromium.org>
This commit is contained in:
parent
b5e223ac4c
commit
7f00d67d7c
@ -1,6 +1,6 @@
|
||||
Name: libyuv
|
||||
URL: http://code.google.com/p/libyuv/
|
||||
Version: 1746
|
||||
Version: 1747
|
||||
License: BSD
|
||||
License File: LICENSE
|
||||
|
||||
|
||||
@ -427,7 +427,6 @@ int RAWToJ400(const uint8_t* src_raw,
|
||||
int width,
|
||||
int height);
|
||||
|
||||
#ifdef HAVE_JPEG
|
||||
// src_width/height provided by capture.
|
||||
// dst_width/height for clipping determine final size.
|
||||
LIBYUV_API
|
||||
@ -463,7 +462,6 @@ int MJPGSize(const uint8_t* sample,
|
||||
size_t sample_size,
|
||||
int* width,
|
||||
int* height);
|
||||
#endif
|
||||
|
||||
// Convert camera sample to I420 with cropping, rotation and vertical flip.
|
||||
// "src_size" is needed to parse MJPG.
|
||||
|
||||
@ -956,7 +956,6 @@ int AR30ToAB30(const uint8_t* src_ar30,
|
||||
int width,
|
||||
int height);
|
||||
|
||||
#ifdef HAVE_JPEG
|
||||
// src_width/height provided by capture
|
||||
// dst_width/height for clipping determine final size.
|
||||
LIBYUV_API
|
||||
@ -968,7 +967,6 @@ int MJPGToARGB(const uint8_t* sample,
|
||||
int src_height,
|
||||
int dst_width,
|
||||
int dst_height);
|
||||
#endif
|
||||
|
||||
// Convert Android420 to ARGB.
|
||||
LIBYUV_API
|
||||
|
||||
@ -11,6 +11,6 @@
|
||||
#ifndef INCLUDE_LIBYUV_VERSION_H_
|
||||
#define INCLUDE_LIBYUV_VERSION_H_
|
||||
|
||||
#define LIBYUV_VERSION 1746
|
||||
#define LIBYUV_VERSION 1747
|
||||
|
||||
#endif // INCLUDE_LIBYUV_VERSION_H_
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user