coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-16 15:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Respect HAVE_JPEG and build cleanly

Browse Source 
BUG=93
TEST=none
Review URL: https://webrtc-codereview.appspot.com/812004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@361 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-09-18 21:31:21 +00:00
parent 142f6c4ed5
commit 5625adfa12
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 360 Version: 361
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 360 #define LIBYUV_VERSION 361
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

7
source/convert.cc
View File

@ -1697,7 +1697,12 @@ int MJPGToI420(const uint8* sample,
// src_height is used to compute location of planes, and indicate inversion // src_height is used to compute location of planes, and indicate inversion
// sample_size is measured in bytes and is the size of the frame. // sample_size is measured in bytes and is the size of the frame.
// With MJPEG it is the compressed size of the frame. // With MJPEG it is the compressed size of the frame.
int ConvertToI420(const uint8* sample, size_t sample_size, int ConvertToI420(const uint8* sample,
#ifdef HAVE_JPEG
size_t sample_size,
#else
size_t /* sample_size */,
#endif
uint8* y, int y_stride, uint8* y, int y_stride,
uint8* u, int u_stride, uint8* u, int u_stride,
uint8* v, int v_stride, uint8* v, int v_stride,