coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-10 02:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add extern c around jpeg header

Browse Source 
BUG=305
TESTED=try bots
R=michaelbai@chromium.org

Review URL: https://webrtc-codereview.appspot.com/7069004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@967 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-01-13 19:43:43 +00:00
parent 9c6e52791f
commit ae997018e5
3 changed files with 12 additions and 2 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
URL: http://code.google.com/p/libyuv/
Version: 966
Version: 967
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 966
#define LIBYUV_VERSION 967
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

10
source/mjpeg_decoder.cc
View File

@ -18,8 +18,18 @@
#define HAVE_SETJMP
#endif
struct FILE; // For jpeglib.h.
// C++ build requires extern C for jpeg internals.
#ifdef __cplusplus
extern "C" {
#endif
#include <jpeglib.h>
#ifdef __cplusplus
} // extern "C"
#endif
#include "libyuv/planar_functions.h" // For CopyPlane().
namespace libyuv {