coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-06 16:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

ifdef around jpeg

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/392021

git-svn-id: http://libyuv.googlecode.com/svn/trunk@182 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-02-21 22:51:56 +00:00
parent 392cc2c425
commit 8058db48d0
3 changed files with 4 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 Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 181 Version: 182
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 181 #define LIBYUV_VERSION 182
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_

2
source/convert.cc
View File

@ -1855,6 +1855,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size,
dst_width, inv_dst_height); dst_width, inv_dst_height);
break; break;
} }
#ifdef HAVE_JPEG
case FOURCC_MJPG: case FOURCC_MJPG:
r = MJPGToI420(sample, sample_size, r = MJPGToI420(sample, sample_size,
y, y_stride, y, y_stride,
@ -1862,6 +1863,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size,
v, v_stride, v, v_stride,
src_width, abs_src_height, dst_width, inv_dst_height); src_width, abs_src_height, dst_width, inv_dst_height);
break; break;
#endif
default: default:
return -1; // unknown fourcc - return failure code. return -1; // unknown fourcc - return failure code.
} }