diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-12-06 13:48:19 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-12-06 13:48:23 +0900 |
| commit | 0d93015a8118cbf3eb63262c9c221fba2f9c688b (patch) | |
| tree | 384723c1af3ccbb359178d7989b5926b86030b44 | |
| parent | 6e8dbefef2966ba50f4021e21fd9e9cf9d7c86a3 (diff) | |
| parent | 3ae032d25a0c7d905266ee28b6c5ef2700b87612 (diff) | |
| download | camera-0d93015a8118cbf3eb63262c9c221fba2f9c688b.tar.gz camera-0d93015a8118cbf3eb63262c9c221fba2f9c688b.tar.bz2 camera-0d93015a8118cbf3eb63262c9c221fba2f9c688b.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161206.052949accepted/tizen/3.0/wearable/20161207.011753accepted/tizen/3.0/tv/20161207.011656accepted/tizen/3.0/mobile/20161207.011448accepted/tizen/3.0/ivi/20161207.011902accepted/tizen/3.0/common/20161207.194449
Change-Id: I6f45473d9e7e2f3981ef94d10045f6791a9cadaa
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index f29f917..4eb1ca4 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -1,6 +1,6 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.2.87 +Version: 0.2.88 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index b4f152d..8919206 100644 --- a/src/camera.c +++ b/src/camera.c @@ -1513,10 +1513,8 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m LOGD("return buffer done"); } break; - case MUSE_CAMERA_EVENT_TYPE_VIDEO_FRAME_RENDER_ERROR: - break; - default: - LOGW("Unknown event : %d", event); + default: /* MUSE_CAMERA_EVENT_TYPE_VIDEO_FRAME_RENDER_ERROR */ + LOGE("render error"); break; } |