mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
Update for API changes in GIO and require GIO 2.15.2 for this.
Original commit message from CVS: * configure.ac: * tests/check/pipelines/gio.c: (GST_START_TEST): Update for API changes in GIO and require GIO 2.15.2 for this.
This commit is contained in:
parent
92c7808796
commit
ae0feba9ec
4 changed files with 14 additions and 14 deletions
|
@ -1,3 +1,9 @@
|
|||
2008-01-16 Sebastian Dröge <slomo@circular-chaos.org>
|
||||
|
||||
* configure.ac:
|
||||
* tests/check/pipelines/gio.c: (GST_START_TEST):
|
||||
Update for API changes in GIO and require GIO 2.15.2 for this.
|
||||
|
||||
2008-01-14 Sebastian Dröge <slomo@circular-chaos.org>
|
||||
|
||||
* gst/xingheader/gstxingmux.c: (generate_xing_header):
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 36e8d05157d6c831e0d3919ae2ee9c342498eda8
|
||||
Subproject commit 0efbab89d333b5d07cc7da1a501c38edf5bb4f72
|
|
@ -595,7 +595,7 @@ AG_GST_CHECK_FEATURE(FBDEV, [linux framebuffer], fbdevsink, [
|
|||
dnl *** libgio ***
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
|
||||
AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [
|
||||
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.1, HAVE_GIO="yes", [
|
||||
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.2, HAVE_GIO="yes", [
|
||||
HAVE_GIO="no"
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
|
|
@ -57,12 +57,6 @@ message_handler (GstBus * bus, GstMessage * msg, gpointer data)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
free_input (gpointer data)
|
||||
{
|
||||
g_free (data);
|
||||
}
|
||||
|
||||
GST_START_TEST (test_memory_stream)
|
||||
{
|
||||
GMainLoop *loop;
|
||||
|
@ -74,7 +68,7 @@ GST_START_TEST (test_memory_stream)
|
|||
GMemoryOutputStream *output;
|
||||
|
||||
guint8 *in_data;
|
||||
GByteArray *out_data;
|
||||
guint8 *out_data;
|
||||
gint i;
|
||||
GstFormat fmt = GST_FORMAT_BYTES;
|
||||
gint64 duration;
|
||||
|
@ -82,16 +76,16 @@ GST_START_TEST (test_memory_stream)
|
|||
got_eos = FALSE;
|
||||
|
||||
in_data = g_new (guint8, 512);
|
||||
out_data = g_new (guint8, 512);
|
||||
for (i = 0; i < 512; i++)
|
||||
in_data[i] = i % 256;
|
||||
|
||||
input =
|
||||
G_MEMORY_INPUT_STREAM (g_memory_input_stream_new_from_data (in_data, 512,
|
||||
free_input));
|
||||
(GDestroyNotify) g_free));
|
||||
|
||||
out_data = g_byte_array_new ();
|
||||
output = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new (out_data));
|
||||
g_memory_output_stream_set_free_data (output, TRUE);
|
||||
output = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new (out_data, 512,
|
||||
(GReallocFunc) g_realloc, (GDestroyNotify) g_free));
|
||||
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
||||
|
@ -128,7 +122,7 @@ GST_START_TEST (test_memory_stream)
|
|||
fail_unless (got_eos);
|
||||
|
||||
for (i = 0; i < 512; i++)
|
||||
fail_unless_equals_int (in_data[i], out_data->data[i]);
|
||||
fail_unless_equals_int (in_data[i], out_data[i]);
|
||||
|
||||
g_object_unref (input);
|
||||
g_object_unref (output);
|
||||
|
|
Loading…
Reference in a new issue