diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2006-10-30 09:24:53 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2006-10-30 09:24:53 +0000 |
commit | 39d8d88afe8870ecf3449a02883e036e273770d6 (patch) | |
tree | 19ba1be78abad13934bfdae46b243ffc518d018f /ext/jpeg/gstjpegenc.c | |
parent | ccce64b2930a26d0e827846edde62386baceb9bf (diff) |
ext/jpeg/: Various cleanups, capsnego and leak fixes.
Original commit message from CVS:
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_getcaps):
* ext/jpeg/gstsmokedec.c: (gst_smokedec_class_init),
(gst_smokedec_init), (gst_smokedec_finalize), (gst_smokedec_chain),
(gst_smokedec_change_state):
* ext/jpeg/gstsmokeenc.c: (gst_smokeenc_class_init),
(gst_smokeenc_init), (gst_smokeenc_finalize),
(gst_smokeenc_getcaps), (gst_smokeenc_setcaps),
(gst_smokeenc_resync), (gst_smokeenc_chain),
(gst_smokeenc_set_property), (gst_smokeenc_get_property),
(gst_smokeenc_change_state):
Various cleanups, capsnego and leak fixes.
Diffstat (limited to 'ext/jpeg/gstjpegenc.c')
-rw-r--r-- | ext/jpeg/gstjpegenc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 107b14db..5e85d8a0 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -264,12 +264,19 @@ gst_jpegenc_getcaps (GstPad * pad) /* we want to proxy properties like width, height and framerate from the other end of the element */ otherpad = (pad == jpegenc->srcpad) ? jpegenc->sinkpad : jpegenc->srcpad; - caps = gst_pad_get_allowed_caps (otherpad); + + caps = gst_pad_peer_get_caps (otherpad); + if (caps == NULL) + caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); + else + caps = gst_caps_make_writable (caps); + if (pad == jpegenc->srcpad) { name = "image/jpeg"; } else { name = "video/x-raw-yuv"; } + for (i = 0; i < gst_caps_get_size (caps); i++) { structure = gst_caps_get_structure (caps, i); |