summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-02-04 21:40:49 +0000
committerDavid Schleef <ds@schleef.org>2004-02-04 21:40:49 +0000
commitaedc3d17b402e465914c5de7749e5c66e68e2fff (patch)
treeb0bd919d751ec7564a9a5754f34c2553e8a88f65
parent86c195940300fd16f7d236bce260575da940fe21 (diff)
Make sure set_explicit_caps() is called before adding pad.RELEASE-0_7_4BRANCH-RELEASE-0_7_4-ROOTBRANCH-RELEASE-0_7_4
Original commit message from CVS: Make sure set_explicit_caps() is called before adding pad. * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): * gst/id3/gstid3types.c: (gst_id3types_loop): * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead): * gst/realmedia/rmdemux.c: (gst_rmdemux_add_stream):
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegdemux.c4
2 files changed, 3 insertions, 1 deletions
diff --git a/common b/common
-Subproject 508678c12ea745e207eb8bb3be12c156e3bb698
+Subproject 90e64b98d566fd8df793cfc0a9b08b8e5fb356d
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 2fd9a8f..fc52b04 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -321,12 +321,14 @@ gst_ffmpegdemux_loop (GstElement *element)
/* store pad internally */
ffmpegdemux->srcpads[pkt.stream_index] = pad;
- gst_element_add_pad (GST_ELEMENT (ffmpegdemux), pad);
/* get caps that belongs to this stream */
caps = gst_ffmpeg_codecid_to_caps (st->codec.codec_id,
&st->codec);
gst_pad_set_explicit_caps (pad, caps);
+
+ gst_element_add_pad (GST_ELEMENT (ffmpegdemux), pad);
+
/* we continue here, in the next pad-is-usable check,
* we'll return nonetheless */
}