summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2005-01-16 11:07:45 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2005-01-16 11:07:45 +0000
commitd3f5bc20af5eb900ce6ab941bbd291f03a16d65d (patch)
treecfac354b8fb8a305bed0f0298e987b46387c0ef1
parenta5d9d00f1c3d4394c5701741fe1a72c49e123074 (diff)
downloadgst-plugins-bad-d3f5bc20af5eb900ce6ab941bbd291f03a16d65d.tar.gz
gst-plugins-bad-d3f5bc20af5eb900ce6ab941bbd291f03a16d65d.tar.bz2
gst-plugins-bad-d3f5bc20af5eb900ce6ab941bbd291f03a16d65d.zip
Don't return SUCCESS from the state change when the parent call fails
Original commit message from CVS: Don't return SUCCESS from the state change when the parent call fails
-rw-r--r--ChangeLog6
-rw-r--r--ext/swfdec/gstswfdec.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c4ed8ff2..a4a90203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-16 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * ext/swfdec/gstswfdec.c: (gst_swfdec_change_state):
+ Don't return state change success when the parent
+ failed.
+
2005-01-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavimux.c: (gst_avimux_handle_event):
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index 4667ef1f..91e79fb2 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -561,9 +561,7 @@ gst_swfdec_change_state (GstElement * element)
break;
}
- GST_ELEMENT_CLASS (parent_class)->change_state (element);
-
- return GST_STATE_SUCCESS;
+ return GST_ELEMENT_CLASS (parent_class)->change_state (element);
}
static void