summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2008-12-19 18:53:47 +0000
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2008-12-19 18:53:47 +0000
commitf8ae7724ba32d13d7c4cf3a22281337755b89ab5 (patch)
tree3d356220376a6cecbb26ca0166658133a25c68a9
parenteddaf313bdb4ae36cdfdcb58625d397c0b5046a7 (diff)
downloadgst-plugins-bad-f8ae7724ba32d13d7c4cf3a22281337755b89ab5.tar.gz
gst-plugins-bad-f8ae7724ba32d13d7c4cf3a22281337755b89ab5.tar.bz2
gst-plugins-bad-f8ae7724ba32d13d7c4cf3a22281337755b89ab5.zip
gst/qtmux/gstqtmux.c: Do not tempt or suggest to violate gst_collect_pads API specification.
Original commit message from CVS: * gst/qtmux/gstqtmux.c: (gst_qt_mux_change_state): Do not tempt or suggest to violate gst_collect_pads API specification.
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtmux/gstqtmux.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 33fbcf15..06f6eb7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-12-19 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+ * gst/qtmux/gstqtmux.c: (gst_qt_mux_change_state):
+ Do not tempt or suggest to violate gst_collect_pads API specification.
+
+2008-12-19 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
* gst/qtmux/atoms.c:
* gst/qtmux/atoms.h:
* gst/qtmux/descriptors.c:
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index 6446a410..fe784f16 100644
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -1779,7 +1779,6 @@ gst_qt_mux_change_state (GstElement * element, GstStateChange transition)
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- /* FIXME: shouldn't the downwards state-change be done below? */
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_collect_pads_stop (qtmux->collect);
break;