summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/CameraSource.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-15 19:02:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 19:02:45 -0700
commit0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b (patch)
tree50a882510a99e358495d6f1ceef1a50212a35d78 /media/libstagefright/CameraSource.cpp
parent3bdab1621022eddf125386daa7c097c3df64b16b (diff)
parenta5d9071c3e9c6bbcb889b56fe1a7440d130fb0b4 (diff)
downloadframeworks_av-0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b.zip
frameworks_av-0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b.tar.gz
frameworks_av-0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b.tar.bz2
am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread
Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f' * commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f': Add some explicit error log messages
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
-rw-r--r--media/libstagefright/CameraSource.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index 9ccd140..dc55ddf 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -98,6 +98,9 @@ static int32_t getColorFormat(const char* colorFormat) {
return OMX_COLOR_Format16bitRGB565;
}
+ LOGE("Uknown color format (%s), please add it to "
+ "CameraSource::getColorFormat", colorFormat);
+
CHECK_EQ(0, "Unknown color format");
}