diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-11-30 14:41:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 14:41:42 -0800 |
| commit | 07a4e2afc853a5e58dfd123038f61b26b0a6b1c5 (patch) | |
| tree | 40a8c32f5f12b4859f68b7c7c4d29246084f4f42 /camera/inc | |
| parent | d9240ce7eb6a8b67ffaf2c762128d6c711265c49 (diff) | |
| parent | c649608af7babb3e6d922e6a41a0a2166e9e34ee (diff) | |
| download | hardware_ti_omap4-07a4e2afc853a5e58dfd123038f61b26b0a6b1c5.zip hardware_ti_omap4-07a4e2afc853a5e58dfd123038f61b26b0a6b1c5.tar.gz hardware_ti_omap4-07a4e2afc853a5e58dfd123038f61b26b0a6b1c5.tar.bz2 | |
am 67496a60: am 3ffd5d43: Merge changes I0878a9f8,I1011252e into ics-mr1
* commit '67496a60c60076166f6856431f68024a9412c067':
CameraHAL: Perform focus even if CAF has failed
CameraHAL: Enable LDCNSF for Video snapshot
Diffstat (limited to 'camera/inc')
| -rwxr-xr-x | camera/inc/Encoder_libjpeg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h index e4dfc0f..457a0dc 100755 --- a/camera/inc/Encoder_libjpeg.h +++ b/camera/inc/Encoder_libjpeg.h @@ -113,6 +113,8 @@ class Encoder_libjpeg : public Thread { int in_height; int out_width; int out_height; + int right_crop; + int start_offset; const char* format; size_t jpeg_size; }; |