From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Thu, 21 Dec 2006 12:50:00 +0000 (+0000)
Subject: tests/check/elements/: revert my freeze breakage
X-Git-Tag: 1.19.3~505^2~1821
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e564d0a7bdb851c3b8a4413aade934f129d161f;p=platform%2Fupstream%2Fgstreamer.git

tests/check/elements/: revert my freeze breakage

Original commit message from CVS:
* tests/check/elements/amrnbenc.c: (setup_amrnbenc),
(cleanup_amrnbenc):
* tests/check/elements/mpeg2dec.c: (setup_mpeg2dec),
(cleanup_mpeg2dec):
revert my freeze breakage
---

diff --git a/ChangeLog b/ChangeLog
index c102f55d1c..505df9f694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* tests/check/elements/amrnbenc.c: (setup_amrnbenc),
+	(cleanup_amrnbenc):
+	* tests/check/elements/mpeg2dec.c: (setup_mpeg2dec),
+	(cleanup_mpeg2dec):
+	  revert my freeze breakage
+
 2006-12-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/asfdemux/gstasfdemux.c:
@@ -9,7 +17,7 @@
 	(cleanup_amrnbenc):
 	* tests/check/elements/mpeg2dec.c: (setup_mpeg2dec),
 	(cleanup_mpeg2dec):
-	   consistent pad (de)activation
+	  consistent pad (de)activation
 
 2006-12-15  Tim-Philipp Müller  <tim at centricular dot net>
 
diff --git a/tests/check/elements/amrnbenc.c b/tests/check/elements/amrnbenc.c
index c6b26c6f86..fb173a2ce4 100644
--- a/tests/check/elements/amrnbenc.c
+++ b/tests/check/elements/amrnbenc.c
@@ -77,8 +77,6 @@ setup_amrnbenc ()
   amrnbenc = gst_check_setup_element ("amrnbenc");
   srcpad = gst_check_setup_src_pad (amrnbenc, &srctemplate, NULL);
   sinkpad = gst_check_setup_sink_pad (amrnbenc, &sinktemplate, NULL);
-  gst_pad_set_active (mysrcpad, TRUE);
-  gst_pad_set_active (mysinkpad, TRUE);
 
   bus = gst_bus_new ();
   gst_element_set_bus (amrnbenc, bus);
@@ -106,8 +104,6 @@ cleanup_amrnbenc (GstElement * amrnbenc)
   gst_object_unref (bus);
 
   GST_DEBUG ("cleanup_amrnbenc");
-  gst_pad_set_active (mysrcpad, FALSE);
-  gst_pad_set_active (mysinkpad, FALSE);
   gst_check_teardown_src_pad (amrnbenc);
   gst_check_teardown_sink_pad (amrnbenc);
   gst_check_teardown_element (amrnbenc);
diff --git a/tests/check/elements/mpeg2dec.c b/tests/check/elements/mpeg2dec.c
index 2ce7c6d458..d1ad929a35 100644
--- a/tests/check/elements/mpeg2dec.c
+++ b/tests/check/elements/mpeg2dec.c
@@ -1347,8 +1347,6 @@ setup_mpeg2dec ()
   mpeg2dec = gst_check_setup_element ("mpeg2dec");
   mysrcpad = gst_check_setup_src_pad (mpeg2dec, &srctemplate, NULL);
   mysinkpad = gst_check_setup_sink_pad (mpeg2dec, &sinktemplate, NULL);
-  gst_pad_set_active (mysrcpad, TRUE);
-  gst_pad_set_active (mysinkpad, TRUE);
 
   return mpeg2dec;
 }
@@ -1359,8 +1357,6 @@ cleanup_mpeg2dec (GstElement * mpeg2dec)
   GST_DEBUG ("cleanup_mpeg2dec");
   gst_element_set_state (mpeg2dec, GST_STATE_NULL);
 
-  gst_pad_set_active (mysrcpad, FALSE);
-  gst_pad_set_active (mysinkpad, FALSE);
   gst_check_teardown_src_pad (mpeg2dec);
   gst_check_teardown_sink_pad (mpeg2dec);
   gst_check_teardown_element (mpeg2dec);