uvch264src: fix compiler warnings

https://bugzilla.gnome.org/show_bug.cgi?id=750601
This commit is contained in:
Chris Clayton 2015-06-09 18:30:55 +01:00 committed by Tim-Philipp Müller
parent 05cc418ca2
commit 376d831178

View file

@ -1351,23 +1351,26 @@ gst_uvc_h264_src_get_boolean_setting (GstUvcH264Src * self, gchar * property,
gboolean ret = FALSE; gboolean ret = FALSE;
if (g_strcmp0 (property, "enable-sei") == 0) { if (g_strcmp0 (property, "enable-sei") == 0) {
ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE,
offsetof (uvcx_video_config_probe_commit_t, bTimestamp), 1, offsetof (uvcx_video_config_probe_commit_t, bTimestamp), 1,
&min, &def, &max); &min, &def, &max))) {
*changeable = (min != max); *changeable = (min != max);
*default_value = (def != 0); *default_value = (def != 0);
}
} else if (g_strcmp0 (property, "preview-flipped") == 0) { } else if (g_strcmp0 (property, "preview-flipped") == 0) {
ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE,
offsetof (uvcx_video_config_probe_commit_t, bPreviewFlipped), 1, offsetof (uvcx_video_config_probe_commit_t, bPreviewFlipped), 1,
&min, &def, &max); &min, &def, &max))) {
*changeable = (min != max); *changeable = (min != max);
*default_value = (def != 0); *default_value = (def != 0);
}
} else if (g_strcmp0 (property, "fixed-framerate") == 0) { } else if (g_strcmp0 (property, "fixed-framerate") == 0) {
ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE, if ((ret = probe_setting (self, UVCX_VIDEO_CONFIG_PROBE,
offsetof (uvcx_video_config_probe_commit_t, bRateControlMode), 1, offsetof (uvcx_video_config_probe_commit_t, bRateControlMode),
&min, &def, &max); 1, &min, &def, &max))) {
*changeable = ((max & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); *changeable = ((max & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0);
*default_value = ((def & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0); *default_value = ((def & UVC_H264_RATECONTROL_FIXED_FRM_FLG) != 0);
}
} }
return ret; return ret;