Remove build warning - shadows a global declaration 53/282353/1
authorJeongmo Yang <jm80.yang@samsung.com>
Fri, 30 Sep 2022 05:38:23 +0000 (14:38 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Fri, 30 Sep 2022 05:38:23 +0000 (14:38 +0900)
[Version] 0.4.91
[Issue Type] Build

Change-Id: I0365ad8fbd90f534cefa220d9ca3b3d602df8e57
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
packaging/capi-media-camera.spec
test/camera_test.c

index a30a364..645e859 100644 (file)
@@ -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
index 4ec9e23..f3facb7 100644 (file)
@@ -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);