summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-31 07:49:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-31 07:49:32 +0000
commit502a3872cc13daab8085c9a0cb0a0e0008a1ddeb (patch)
tree0f01925d051e3cef3ab70bd2b4a0b3cbd8c6cf19
parent77d97c03749b68b886837084af79f6b2c2be3221 (diff)
parent6c0730fc1030bb41f8857ba5ff768dedb961dce0 (diff)
downloadandroid_hardware_samsung_slsi_exynos5-502a3872cc13daab8085c9a0cb0a0e0008a1ddeb.tar.gz
android_hardware_samsung_slsi_exynos5-502a3872cc13daab8085c9a0cb0a0e0008a1ddeb.tar.bz2
android_hardware_samsung_slsi_exynos5-502a3872cc13daab8085c9a0cb0a0e0008a1ddeb.zip
am 6c0730fc: Merge "Fix "error: \'memset\' was not declared in this scope"."
* commit '6c0730fc1030bb41f8857ba5ff768dedb961dce0': Fix "error: 'memset' was not declared in this scope".
-rw-r--r--libcamera2/ExynosJpegEncoderForCamera.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libcamera2/ExynosJpegEncoderForCamera.cpp b/libcamera2/ExynosJpegEncoderForCamera.cpp
index 9eb924f..14d73af 100644
--- a/libcamera2/ExynosJpegEncoderForCamera.cpp
+++ b/libcamera2/ExynosJpegEncoderForCamera.cpp
@@ -17,6 +17,7 @@
#define LOG_TAG "ExynosJpegForCamera"
#include <utils/Log.h>
+#include <string.h>
#include "ExynosJpegEncoderForCamera.h"