v4l2src: Fix compiler error in example caused by re-declaring index
../tests/examples/v4l2/v4l2src-renegotiate.c:57:13: error: ‘index’ redeclared as different kind of symbol static gint index = 0; ^
This commit is contained in:
parent
433cc96c05
commit
4f7b995ae7
@ -54,7 +54,7 @@ static GOptionEntry entries[] = {
|
|||||||
static GMainLoop *loop;
|
static GMainLoop *loop;
|
||||||
static GstElement *pipeline;
|
static GstElement *pipeline;
|
||||||
static GstElement *src, *capsfilter;
|
static GstElement *src, *capsfilter;
|
||||||
static gint index = 0;
|
static gint resolution_index = 0;
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
bus_callback (GstBus * bus, GstMessage * message, gpointer data)
|
bus_callback (GstBus * bus, GstMessage * message, gpointer data)
|
||||||
@ -88,16 +88,16 @@ change_caps (gpointer data)
|
|||||||
GStrv res;
|
GStrv res;
|
||||||
gchar *caps_str;
|
gchar *caps_str;
|
||||||
|
|
||||||
if (!resolutions[index]) {
|
if (!resolutions[resolution_index]) {
|
||||||
gst_element_send_event (pipeline, gst_event_new_eos ());
|
gst_element_send_event (pipeline, gst_event_new_eos ());
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_print ("Setting resolution to '%s'\n", resolutions[index]);
|
g_print ("Setting resolution to '%s'\n", resolutions[resolution_index]);
|
||||||
|
|
||||||
res = g_strsplit (resolutions[index++], "x", 2);
|
res = g_strsplit (resolutions[resolution_index++], "x", 2);
|
||||||
if (!res[0] || !res[1]) {
|
if (!res[0] || !res[1]) {
|
||||||
g_warning ("Can't parse resolution: %s", resolutions[index - 1]);
|
g_warning ("Can't parse resolution: %s", resolutions[resolution_index - 1]);
|
||||||
g_strfreev (res);
|
g_strfreev (res);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user