projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78f3371
)
tests: use GLib 2.22 API unconditionally
author
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sat, 4 Dec 2010 14:48:46 +0000
(14:48 +0000)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sat, 4 Dec 2010 14:48:46 +0000
(14:48 +0000)
tests/examples/app/appsrc-ra.c
patch
|
blob
|
history
tests/examples/app/appsrc-seekable.c
patch
|
blob
|
history
tests/examples/app/appsrc-stream.c
patch
|
blob
|
history
tests/examples/app/appsrc-stream2.c
patch
|
blob
|
history
diff --git
a/tests/examples/app/appsrc-ra.c
b/tests/examples/app/appsrc-ra.c
index
cdca865
..
af5d7a7
100644
(file)
--- a/
tests/examples/app/appsrc-ra.c
+++ b/
tests/examples/app/appsrc-ra.c
@@
-30,11
+30,6
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-/* FIXME: remove once we depend on GLib >= 2.22 */
-#if !GLIB_CHECK_VERSION (2, 21, 3)
-#define g_mapped_file_unref g_mapped_file_free
-#endif
-
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
diff --git
a/tests/examples/app/appsrc-seekable.c
b/tests/examples/app/appsrc-seekable.c
index
8d873d9
..
9421f9b
100644
(file)
--- a/
tests/examples/app/appsrc-seekable.c
+++ b/
tests/examples/app/appsrc-seekable.c
@@
-30,11
+30,6
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-/* FIXME: remove once we depend on GLib >= 2.22 */
-#if !GLIB_CHECK_VERSION (2, 21, 3)
-#define g_mapped_file_unref g_mapped_file_free
-#endif
-
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
diff --git
a/tests/examples/app/appsrc-stream.c
b/tests/examples/app/appsrc-stream.c
index
986dfb8
..
d14e143
100644
(file)
--- a/
tests/examples/app/appsrc-stream.c
+++ b/
tests/examples/app/appsrc-stream.c
@@
-30,11
+30,6
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-/* FIXME: remove once we depend on GLib >= 2.22 */
-#if !GLIB_CHECK_VERSION (2, 21, 3)
-#define g_mapped_file_unref g_mapped_file_free
-#endif
-
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
diff --git
a/tests/examples/app/appsrc-stream2.c
b/tests/examples/app/appsrc-stream2.c
index
66a5332
..
a80e4d1
100644
(file)
--- a/
tests/examples/app/appsrc-stream2.c
+++ b/
tests/examples/app/appsrc-stream2.c
@@
-30,11
+30,6
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-/* FIXME: remove once we depend on GLib >= 2.22 */
-#if !GLIB_CHECK_VERSION (2, 21, 3)
-#define g_mapped_file_unref g_mapped_file_free
-#endif
-
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug
GST_DEBUG_CATEGORY (appsrc_playbin_debug);
#define GST_CAT_DEFAULT appsrc_playbin_debug