Merge pull request #539 from anjanik012/fix_build

Fix build: refactor variables to avoid same names in a scope
This commit is contained in:
DeepBlueV7.X 2021-03-28 17:21:10 +00:00 committed by GitHub
commit c5f4245945
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -111,9 +111,9 @@ addDevice(GstDevice *device)
g_free(name); g_free(name);
guint nCaps = gst_caps_get_size(gstcaps); guint nCaps = gst_caps_get_size(gstcaps);
for (guint i = 0; i < nCaps; ++i) { for (guint i = 0; i < nCaps; ++i) {
GstStructure *structure = gst_caps_get_structure(gstcaps, i); GstStructure *structure = gst_caps_get_structure(gstcaps, i);
const gchar *name = gst_structure_get_name(structure); const gchar *struct_name = gst_structure_get_name(structure);
if (!std::strcmp(name, "video/x-raw")) { if (!std::strcmp(struct_name, "video/x-raw")) {
gint widthpx, heightpx; gint widthpx, heightpx;
if (gst_structure_get(structure, if (gst_structure_get(structure,
"width", "width",
@ -142,8 +142,8 @@ addDevice(GstDevice *device)
for (guint j = 0; j < nRates; ++j) { for (guint j = 0; j < nRates; ++j) {
const GValue *rate = const GValue *rate =
gst_value_list_get_value(value, j); gst_value_list_get_value(value, j);
if (auto fr = getFrameRate(rate); fr) if (auto frate = getFrameRate(rate); frate)
addFrameRate(caps.frameRates, *fr); addFrameRate(caps.frameRates, *frate);
} }
} }
if (!caps.frameRates.empty()) if (!caps.frameRates.empty())