summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2011-04-14 12:55:00 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-04-14 12:55:00 +0200
commit10e0b85a5695eda8e7d358d49e00966a09df0569 (patch)
tree89e3b002ffcdb82e66d75c0817a59a40d5c126e4
parent67d2f852ffe1851a1e243b6ae1e98fa789acbbfb (diff)
encodebin: Release pads after setting the state to NULL in the unit test
See bug #647756.
-rw-r--r--tests/check/elements/encodebin.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/check/elements/encodebin.c b/tests/check/elements/encodebin.c
index 0d0d00948..866abc3ec 100644
--- a/tests/check/elements/encodebin.c
+++ b/tests/check/elements/encodebin.c
@@ -359,15 +359,15 @@ GST_START_TEST (test_encodebin_sink_pads_multiple_dynamic)
fail_unless_equals_int (gst_element_set_state (ebin, GST_STATE_PAUSED),
GST_STATE_CHANGE_SUCCESS);
+ /* Set back to NULL */
+ fail_unless_equals_int (gst_element_set_state (ebin, GST_STATE_NULL),
+ GST_STATE_CHANGE_SUCCESS);
+
gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpadvorbis);
gst_object_unref (sinkpadvorbis);
gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpadtheora);
gst_object_unref (sinkpadtheora);
- /* Set back to NULL */
- fail_unless_equals_int (gst_element_set_state (ebin, GST_STATE_NULL),
- GST_STATE_CHANGE_SUCCESS);
-
gst_object_unref (ebin);
};
@@ -604,13 +604,13 @@ GST_START_TEST (test_encodebin_render_audio_dynamic)
}
}
- gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpad);
- gst_object_unref (sinkpad);
-
/* Set back to NULL */
fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_NULL),
GST_STATE_CHANGE_SUCCESS);
+ gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpad);
+ gst_object_unref (sinkpad);
+
gst_object_unref (bus);
gst_object_unref (pipeline);
@@ -745,15 +745,15 @@ GST_START_TEST (test_encodebin_render_audio_video_dynamic)
}
}
+ /* Set back to NULL */
+ fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_NULL),
+ GST_STATE_CHANGE_SUCCESS);
+
gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpad1);
gst_object_unref (sinkpad1);
gst_element_release_request_pad (GST_ELEMENT (ebin), sinkpad2);
gst_object_unref (sinkpad2);
- /* Set back to NULL */
- fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_NULL),
- GST_STATE_CHANGE_SUCCESS);
-
gst_object_unref (bus);
gst_object_unref (pipeline);