diff options
| author | David Schleef <ds@schleef.org> | 2004-01-02 23:11:41 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-02 23:11:41 +0000 |
| commit | 87e0627bfbebd83a5ea629197043ea3f50aa7bdc (patch) | |
| tree | 9be38e76e2f2915a673cef04eed5483d9c7346ca | |
| parent | fa2f874ba710bad52d4e3f4470e1e0644d771a4d (diff) | |
| download | gst-libav-87e0627bfbebd83a5ea629197043ea3f50aa7bdc.tar.gz | |
ext/ffmpeg/gstffmpegenc.c: Negotiation fixes.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init),
(gst_ffmpegenc_connect): Negotiation fixes.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
Remove inappropriate gst_caps_free().
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Reenable Ronald's internal resize code, since the core handles
it correctly now.
| -rw-r--r-- | ext/ffmpeg/gstffmpegenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index b10826b..467fe84 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -241,6 +241,7 @@ gst_ffmpegenc_init(GstFFMpegEnc *ffmpegenc) ffmpegenc->sinkpad = gst_pad_new_from_template (oclass->sinktempl, "sink"); gst_pad_set_link_function (ffmpegenc->sinkpad, gst_ffmpegenc_connect); ffmpegenc->srcpad = gst_pad_new_from_template (oclass->srctempl, "src"); + gst_pad_use_explicit_caps (ffmpegenc->srcpad); gst_element_add_pad (GST_ELEMENT (ffmpegenc), ffmpegenc->sinkpad); gst_element_add_pad (GST_ELEMENT (ffmpegenc), ffmpegenc->srcpad); @@ -344,11 +345,11 @@ gst_ffmpegenc_connect (GstPad *pad, return GST_PAD_LINK_REFUSED; } - if ((ret = gst_pad_try_set_caps (ffmpegenc->srcpad, other_caps)) <= 0) { + /* FIXME set_explicit_caps is not supposed to be used in a pad link + * function. */ + if (!gst_pad_set_explicit_caps (ffmpegenc->srcpad, other_caps)) { avcodec_close (ffmpegenc->context); - GST_DEBUG ("Failed to set caps on next element for ffmpeg encoder (%s)", - oclass->in_plugin->name); - return ret; + return GST_PAD_LINK_REFUSED; } /* success! */ |