diff --git a/ChangeLog b/ChangeLog index b8aba2b03a..b3719bb43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-05 Tim-Philipp Müller + + * 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 * configure.ac: diff --git a/common b/common index ee0bb43e2b..64f924f6f2 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ee0bb43e2b66781d04078e2210404da48f6c68f0 +Subproject commit 64f924f6f2ff6275b06facb4c2adbc7c05f70641 diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c index 775446bee7..38eaa9bcaf 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);