diff options
| author | Chris Clayton <chris2553@googlemail.com> | 2015-06-09 18:30:55 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-06-09 18:30:55 +0100 |
| commit | 376d8311785512de2a14fc2d16a376e5816ab7c0 (patch) | |
| tree | 5c00e9aa798b7bef2f5d6051c4aa188bc4abba7f /sys/uvch264 | |
| parent | 05cc418ca23a7a3c3603b30db8599d989fac0b77 (diff) | |
| download | gstreamer-plugins-bad-376d8311785512de2a14fc2d16a376e5816ab7c0.tar.gz | |
uvch264src: fix compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=750601
Diffstat (limited to 'sys/uvch264')
| -rw-r--r-- | sys/uvch264/gstuvch264_src.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c index 9e0cbb9f0..4011e973c 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; |