diff options
| author | David Schleef <ds@schleef.org> | 2004-01-02 07:09:20 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-02 07:09:20 +0000 |
| commit | 4231dbd872690563f1c791732d20f235d3f0fdc4 (patch) | |
| tree | 4dda93e3cf7d154a3e95fcc48b67a11fb9efcccf | |
| parent | e1c922ecac01d7f57583301ee3230c82ada058e9 (diff) | |
| download | gst-libav-4231dbd872690563f1c791732d20f235d3f0fdc4.tar.gz | |
Convert elements to use gst_pad_use_explicit_caps() where appropriate.
Original commit message from CVS:
Convert elements to use gst_pad_use_explicit_caps() where appropriate.
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 3 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdemux.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 7669dd4..bb938ea 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -179,6 +179,7 @@ gst_ffmpegdec_init (GstFFMpegDec *ffmpegdec) gst_pad_set_link_function (ffmpegdec->sinkpad, gst_ffmpegdec_connect); gst_pad_set_chain_function (ffmpegdec->sinkpad, gst_ffmpegdec_chain); ffmpegdec->srcpad = gst_pad_new_from_template (oclass->srctempl, "src"); + gst_pad_use_explicit_caps (ffmpegdec->srcpad); gst_element_add_pad (GST_ELEMENT (ffmpegdec), ffmpegdec->sinkpad); gst_element_add_pad (GST_ELEMENT (ffmpegdec), ffmpegdec->srcpad); @@ -410,7 +411,7 @@ gst_ffmpegdec_chain (GstPad *pad, caps = gst_ffmpeg_codectype_to_caps (oclass->in_plugin->type, ffmpegdec->context); if (caps == NULL || - gst_pad_try_set_caps (ffmpegdec->srcpad, caps) <= 0) { + !gst_pad_set_explicit_caps (ffmpegdec->srcpad, caps)) { gst_element_error (GST_ELEMENT (ffmpegdec), "Failed to link ffmpeg decoder (%s) to next element", oclass->in_plugin->name); diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index da76f3d..b6133f5 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -316,6 +316,7 @@ gst_ffmpegdemux_loop (GstElement *element) pad = gst_pad_new_from_template (templ, padname); g_free (padname); + gst_pad_use_explicit_caps (pad); /* FIXME: convert() and query() functions for pad */ /* store pad internally */ @@ -325,12 +326,9 @@ gst_ffmpegdemux_loop (GstElement *element) /* get caps that belongs to this stream */ caps = gst_ffmpeg_codecid_to_caps (st->codec.codec_id, &st->codec); - if (gst_pad_try_set_caps (pad, caps) <= 0) { - GST_DEBUG ( - "Failed to set caps from ffdemuxer on next element"); - /* we continue here, in the next pad-is-usable check, - * we'll return nonetheless */ - } + gst_pad_set_explicit_caps (pad, caps); + /* we continue here, in the next pad-is-usable check, + * we'll return nonetheless */ } /* shortcut to pad belonging to this stream */ |