summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-01-05 16:07:12 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-01-05 16:07:12 +0000
commitaf11eaab0c290e0e85b8dc442690f17a1b696ad1 (patch)
tree0c32d7307a865518e42f7c6d9fc626278d4f4fc1
parent289b30d543210633ff1b09fa4eac0c89913a9b54 (diff)
downloadgst-plugins-bad-af11eaab0c290e0e85b8dc442690f17a1b696ad1.tar.gz
gst-plugins-bad-af11eaab0c290e0e85b8dc442690f17a1b696ad1.tar.bz2
gst-plugins-bad-af11eaab0c290e0e85b8dc442690f17a1b696ad1.zip
tests/icles/videocrop-test.c: Call g_thread_init() right at the beginning. Remove superfluous gst_init() - we've alre...
Original commit message from CVS: * tests/icles/videocrop-test.c: (main): Call g_thread_init() right at the beginning. Remove superfluous gst_init() - we've already been inited via the GOption stuff.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--tests/icles/videocrop-test.c5
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8aba2b0..b3719bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-01-05 Tim-Philipp Müller <tim at centricular dot net>
+ * tests/icles/videocrop-test.c: (main):
+ Call g_thread_init() right at the beginning. Remove superfluous
+ gst_init() - we've already been inited via the GOption stuff.
+
+2007-01-05 Tim-Philipp Müller <tim at centricular dot net>
+
* configure.ac:
Don't compile rfbsource if we don't have sys/socket.h.
Should fix compilation on MingW.
diff --git a/common b/common
-Subproject ee0bb43e2b66781d04078e2210404da48f6c68f
+Subproject 64f924f6f2ff6275b06facb4c2adbc7c05f7064
diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c
index 775446be..38eaa9bc 100644
--- a/tests/icles/videocrop-test.c
+++ b/tests/icles/videocrop-test.c
@@ -153,6 +153,9 @@ main (int argc, char **argv)
GstCaps *filter_caps = NULL;
GList *caps_list, *l;
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
+
/* command line option parsing */
ctx = g_option_context_new ("");
g_option_context_add_group (ctx, gst_init_get_option_group ());
@@ -163,8 +166,6 @@ main (int argc, char **argv)
return -1;
}
- gst_init (&argc, &argv);
-
GST_DEBUG_CATEGORY_INIT (videocrop_test_debug, "videocroptest", 0, "vctest");
loop = g_main_loop_new (NULL, FALSE);