From 376d8311785512de2a14fc2d16a376e5816ab7c0 Mon Sep 17 00:00:00 2001 From: Chris Clayton Date: Tue, 9 Jun 2015 18:30:55 +0100 Subject: [PATCH] uvch264src: fix compiler warnings https://bugzilla.gnome.org/show_bug.cgi?id=750601 --- sys/uvch264/gstuvch264_src.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c index 9e0cbb9..4011e97 100644 --- a/sys/uvch264/gstuvch264_src.c +++ b/sys/uvch264/gstuvch264_src.c @@ -1351,23 +1351,26 @@ gst_uvc_h264_src_get_boolean_setting (GstUvcH264Src * self, gchar * property, gboolean ret = FALSE; if (g_strcmp0 (property, "enable-sei") == 0) { - ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, - offsetof (uvcx_video_config_probe_commit_t, bTimestamp), 1, - &min, &def, &max); - *changeable = (min != max); - *default_value = (def != 0); + if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, + offsetof (uvcx_video_config_probe_commit_t, bTimestamp), 1, + &min, &def, &max))) { + *changeable = (min != max); + *default_value = (def != 0); + } } else if (g_strcmp0 (property, "preview-flipped") == 0) { - ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, - offsetof (uvcx_video_config_probe_commit_t, bPreviewFlipped), 1, - &min, &def, &max); - *changeable = (min != max); - *default_value = (def != 0); + if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, + offsetof (uvcx_video_config_probe_commit_t, bPreviewFlipped), 1, + &min, &def, &max))) { + *changeable = (min != max); + *default_value = (def != 0); + } } else if (g_strcmp0 (property, "fixed-framerate") == 0) { - ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, - offsetof (uvcx_video_config_probe_commit_t, bRateControlMode), 1, - &min, &def, &max); - *changeable = ((max & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); - *default_value = ((def & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); + if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, + offsetof (uvcx_video_config_probe_commit_t, bRateControlMode), + 1, &min, &def, &max))) { + *changeable = ((max & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); + *default_value = ((def & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); + } } return ret; -- 2.7.4