summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-02-03 18:42:48 +0000
committerBenjamin Otte <otte@gnome.org>2004-02-03 18:42:48 +0000
commit4c0511c1dfe5915c3d2395fd754ad13c6a278f49 (patch)
tree093311ee20b0276d153d0e07e94bc7fd7f005acd
parent4785fe4a9704b659f857e9297ddb9f6e800620ce (diff)
downloadgst-plugins-bad-4c0511c1dfe5915c3d2395fd754ad13c6a278f49.tar.gz
gst-plugins-bad-4c0511c1dfe5915c3d2395fd754ad13c6a278f49.tar.bz2
gst-plugins-bad-4c0511c1dfe5915c3d2395fd754ad13c6a278f49.zip
gst/qtdemux/qtdemux.c: set explicit caps before adding the element, so the autopluggers can plug correctly.
Original commit message from CVS: 2004-02-03 Benjamin Otte <in7y118@public.uni-hamburg.de> * gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream): set explicit caps before adding the element, so the autopluggers can plug correctly. * gst/typefind/gsttypefindfunctions.c: (mp3_type_find), (mpeg2_sys_type_find), (mpeg1_sys_type_find), (mpeg_video_type_find), (mpeg_video_stream_type_find), (dv_type_find): fix memleaks in typefind functions. gst_type_find_suggest takes a const argument.
-rw-r--r--ChangeLog12
-rw-r--r--gst/qtdemux/qtdemux.c4
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d0b0e083..6979c344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-03 Benjamin Otte <in7y118@public.uni-hamburg.de>
+
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream):
+ set explicit caps before adding the element, so the autopluggers can
+ plug correctly.
+ * gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
+ (mpeg2_sys_type_find), (mpeg1_sys_type_find),
+ (mpeg_video_type_find), (mpeg_video_stream_type_find),
+ (dv_type_find):
+ fix memleaks in typefind functions. gst_type_find_suggest takes a const
+ argument.
+
2004-02-03 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/colorbalance/Makefile.am:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index a5ecf66a..96c1b4f6 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -562,10 +562,10 @@ void gst_qtdemux_add_stream(GstQTDemux *qtdemux, QtDemuxStream *stream)
qtdemux->n_streams++;
GST_DEBUG ("n_streams is now %d", qtdemux->n_streams);
+ gst_pad_set_explicit_caps(stream->pad, stream->caps);
+
GST_DEBUG ("adding pad %p to qtdemux %p", stream->pad, qtdemux);
gst_element_add_pad(GST_ELEMENT (qtdemux), stream->pad);
-
- gst_pad_set_explicit_caps(stream->pad, stream->caps);
}