From 5f7afa1a2e57812135361e78341236a5dbc171ad Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Fri, 30 Sep 2022 14:38:23 +0900 Subject: [PATCH] Remove build warning - shadows a global declaration [Version] 0.4.91 [Issue Type] Build Change-Id: I0365ad8fbd90f534cefa220d9ca3b3d602df8e57 Signed-off-by: Jeongmo Yang --- packaging/capi-media-camera.spec | 2 +- test/camera_test.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index a30a364..645e859 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.4.90 +Version: 0.4.91 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/test/camera_test.c b/test/camera_test.c index 4ec9e23..f3facb7 100644 --- a/test/camera_test.c +++ b/test/camera_test.c @@ -1765,7 +1765,7 @@ static void __enable_extra_preview_and_callback(camera_h camera) int height = 0; int fps = 0; int pixel_format = 0; - int camera_device = 0; + int device = 0; g_print("\n\t- Format list"); g_print("\n\t0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888"); @@ -1789,11 +1789,11 @@ static void __enable_extra_preview_and_callback(camera_h camera) g_print("\n\t## for MM_CAMCORDER_EXTRA_PREVIEW_MODE_PIPELINE_ELEMENT ##\n"); g_print("\n\tSet device for extra preview[0 ~ 9] : "); - err = scanf("%d", (int *)&camera_device); + err = scanf("%d", (int *)&device); flush_stdin(); - err = camera_set_extra_preview_device(hcamcorder->camera, 0, camera_device); - g_print("\n\tcamera_set_extra_preview_device(device:%d) 0x%x\n", camera_device, err); + err = camera_set_extra_preview_device(hcamcorder->camera, 0, device); + g_print("\n\tcamera_set_extra_preview_device(device:%d) 0x%x\n", device, err); g_print("\n\tDump extra preview data to file - NO[0], YES[Others] : "); err = scanf("%d", &g_camera_extra_preview_cb_dump); -- 2.7.4