projects
/
platform
/
upstream
/
gst-plugins-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 0.11
[platform/upstream/gst-plugins-base.git]
/
tests
/
icles
/
test-colorkey.c
diff --git
a/tests/icles/test-colorkey.c
b/tests/icles/test-colorkey.c
index
fdd9899
..
5cecb64
100644
(file)
--- a/
tests/icles/test-colorkey.c
+++ b/
tests/icles/test-colorkey.c
@@
-23,6
+23,11
@@
#include "config.h"
#endif
#include "config.h"
#endif
+/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
+ * with newer GTK versions (>= 3.3.0) */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-173,11
+178,6
@@
main (int argc, char **argv)
GValueArray *arr;
#endif
GValueArray *arr;
#endif
-#if !GLIB_CHECK_VERSION (2, 31, 0)
- if (!g_thread_supported ())
- g_thread_init (NULL);
-#endif
-
gst_init (&argc, &argv);
gtk_init (&argc, &argv);
gst_init (&argc, &argv);
gtk_init (&argc, &argv);