summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-09-25 15:52:39 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-09-25 15:52:39 +0000
commit071b83175203fb8e64a956e80bfff3a21f084b5e (patch)
treed532cf0a02552934c877a6fc6d699ba0f09ea4e4
parentbf9d70b3e5b53999659aacf56f74b954d474a08f (diff)
tests/check/gnloperation.c: Adapt test to 'fixed' behaviour of videomixer fixed by #537361
Original commit message from CVS: * tests/check/gnloperation.c: (GST_START_TEST): Adapt test to 'fixed' behaviour of videomixer fixed by #537361
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--tests/check/gnloperation.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 78434b6..c78048c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * tests/check/gnloperation.c: (GST_START_TEST):
+ Adapt test to 'fixed' behaviour of videomixer fixed by #537361
+
2008-07-29 Edward Hervey <edward.hervey@collabora.co.uk>
* gnl/gnlcomposition.c: (get_current_position),
diff --git a/common b/common
-Subproject e79879859bc866545379eb77e1378a906dc30eb
+Subproject 1ff63d8f92c36bf207434436f4ce75f2a4ea11a
diff --git a/tests/check/gnloperation.c b/tests/check/gnloperation.c
index 9b38701..038d7b6 100644
--- a/tests/check/gnloperation.c
+++ b/tests/check/gnloperation.c
@@ -750,7 +750,7 @@ GST_START_TEST (test_complex_operations)
segment_new (1.0, GST_FORMAT_TIME, 0, 2 * GST_SECOND, 0));
collect->expected_segments = g_list_append (collect->expected_segments,
segment_new (1.0, GST_FORMAT_TIME,
- 2 * GST_SECOND, 4 * GST_SECOND, 2 * GST_SECOND));
+ 0 * GST_SECOND, 2 * GST_SECOND, 2 * GST_SECOND));
collect->expected_segments = g_list_append (collect->expected_segments,
segment_new (1.0, GST_FORMAT_TIME,
4 * GST_SECOND, 6 * GST_SECOND, 4 * GST_SECOND));
@@ -814,7 +814,7 @@ GST_START_TEST (test_complex_operations)
segment_new (1.0, GST_FORMAT_TIME, 0, 2 * GST_SECOND, 0));
collect->expected_segments = g_list_append (collect->expected_segments,
segment_new (1.0, GST_FORMAT_TIME,
- 2 * GST_SECOND, 4 * GST_SECOND, 2 * GST_SECOND));
+ 0 * GST_SECOND, 2 * GST_SECOND, 2 * GST_SECOND));
collect->expected_segments = g_list_append (collect->expected_segments,
segment_new (1.0, GST_FORMAT_TIME,
4 * GST_SECOND, 6 * GST_SECOND, 4 * GST_SECOND));