summaryrefslogtreecommitdiffstats
path: root/ext/jpeg
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-03-15 16:17:12 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-03-15 16:17:12 +0000
commit50f4eb876a9d272847e22e3349309ce3f7ac42dc (patch)
tree82316dc1608ea22e7da781d625c0b0a76bcc2fac /ext/jpeg
parentcd1bbadf591befc4dc6c52c0d5bc1b912ff1c63d (diff)
Fix memleak with gst_static_pad_template_get().
Original commit message from CVS: * ext/cairo/gsttextoverlay.c: (gst_text_overlay_init): * ext/dv/gstdvdemux.c: (gst_dvdemux_init), (gst_dvdemux_add_pads): * ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_init): * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_init), (gst_jpeg_dec_setcaps): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_init): * ext/jpeg/gstsmokedec.c: (gst_smokedec_init): * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_init): * ext/libmng/gstmngdec.c: (gst_mngdec_init), (gst_mngdec_src_getcaps): * ext/libpng/gstpngdec.c: (gst_pngdec_init), (gst_pngdec_caps_create_and_set): * ext/libpng/gstpngenc.c: (gst_pngenc_init): * ext/mikmod/gstmikmod.c: (gst_mikmod_init): * ext/speex/gstspeexdec.c: (gst_speex_dec_init): * gst/alpha/gstalpha.c: (gst_alpha_init): * gst/auparse/gstauparse.c: (gst_au_parse_init): * gst/avi/gstavidemux.c: (gst_avi_demux_init), (gst_avi_demux_handle_src_event), (gst_avi_demux_parse_stream): * gst/cutter/gstcutter.c: (gst_cutter_init): * gst/debug/efence.c: (gst_efence_init), (gst_efence_getrange), (gst_efence_checkgetrange): * gst/debug/negotiation.c: (gst_negotiation_init): * gst/flx/gstflxdec.c: (gst_flxdec_init): * gst/goom/gstgoom.c: (gst_goom_init): * gst/rtp/gstasteriskh263.c: (gst_asteriskh263_init): * gst/rtp/gstrtpL16depay.c: (gst_rtp_L16depay_init): * gst/rtp/gstrtpL16pay.c: (gst_rtpL16pay_init): * gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_init): * gst/rtp/gstrtpdepay.c: (gst_rtp_depay_init): * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_init): * gst/rtsp/gstrtpdec.c: (gst_rtpdec_init): * gst/smpte/gstsmpte.c: (gst_smpte_init): * gst/wavparse/gstwavparse.c: (gst_wavparse_init), (gst_wavparse_create_sourcepad): Fix memleak with gst_static_pad_template_get(). This uses gst_pad_new_from_static_template() instead. Fixes #333512
Diffstat (limited to 'ext/jpeg')
-rw-r--r--ext/jpeg/gstjpegdec.c10
-rw-r--r--ext/jpeg/gstjpegenc.c6
-rw-r--r--ext/jpeg/gstsmokedec.c7
-rw-r--r--ext/jpeg/gstsmokeenc.c7
4 files changed, 14 insertions, 16 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 472b3520..492831fc 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -232,8 +232,8 @@ gst_jpeg_dec_init (GstJpegDec * dec)
/* create the sink and src pads */
dec->sinkpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_jpeg_dec_sink_pad_template), "sink");
+ gst_pad_new_from_static_template (&gst_jpeg_dec_sink_pad_template,
+ "sink");
gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad);
gst_pad_set_setcaps_function (dec->sinkpad,
GST_DEBUG_FUNCPTR (gst_jpeg_dec_setcaps));
@@ -241,8 +241,7 @@ gst_jpeg_dec_init (GstJpegDec * dec)
GST_DEBUG_FUNCPTR (gst_jpeg_dec_chain));
dec->srcpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_jpeg_dec_src_pad_template), "src");
+ gst_pad_new_from_static_template (&gst_jpeg_dec_src_pad_template, "src");
gst_element_add_pad (GST_ELEMENT (dec), dec->srcpad);
/* setup jpeglib */
@@ -606,6 +605,9 @@ gst_jpeg_dec_setcaps (GstPad * pad, GstCaps * caps)
/* do not extract width/height here. we do that in the chain
* function on a per-frame basis (including the line[] array
* setup) */
+
+ /* But we can take the framerate values and set them on the src pad */
+
return TRUE;
}
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index b76b6205..59fc1022 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -205,16 +205,14 @@ gst_jpegenc_init (GstJpegEnc * jpegenc)
{
/* create the sink and src pads */
jpegenc->sinkpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_jpegenc_sink_pad_template), "sink");
+ gst_pad_new_from_static_template (&gst_jpegenc_sink_pad_template, "sink");
gst_pad_set_chain_function (jpegenc->sinkpad, gst_jpegenc_chain);
gst_pad_set_getcaps_function (jpegenc->sinkpad, gst_jpegenc_getcaps);
gst_pad_set_setcaps_function (jpegenc->sinkpad, gst_jpegenc_setcaps);
gst_element_add_pad (GST_ELEMENT (jpegenc), jpegenc->sinkpad);
jpegenc->srcpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_jpegenc_src_pad_template), "src");
+ gst_pad_new_from_static_template (&gst_jpegenc_src_pad_template, "src");
gst_pad_set_getcaps_function (jpegenc->sinkpad, gst_jpegenc_getcaps);
/*gst_pad_set_setcaps_function (jpegenc->sinkpad, gst_jpegenc_setcaps); */
gst_pad_use_fixed_caps (jpegenc->sinkpad);
diff --git a/ext/jpeg/gstsmokedec.c b/ext/jpeg/gstsmokedec.c
index 72ed8fe0..ddeb0367 100644
--- a/ext/jpeg/gstsmokedec.c
+++ b/ext/jpeg/gstsmokedec.c
@@ -131,14 +131,13 @@ gst_smokedec_init (GstSmokeDec * smokedec)
/* create the sink and src pads */
smokedec->sinkpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_smokedec_sink_pad_template), "sink");
+ gst_pad_new_from_static_template (&gst_smokedec_sink_pad_template,
+ "sink");
gst_pad_set_chain_function (smokedec->sinkpad, gst_smokedec_chain);
gst_element_add_pad (GST_ELEMENT (smokedec), smokedec->sinkpad);
smokedec->srcpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_smokedec_src_pad_template), "src");
+ gst_pad_new_from_static_template (&gst_smokedec_src_pad_template, "src");
gst_pad_use_fixed_caps (smokedec->srcpad);
gst_element_add_pad (GST_ELEMENT (smokedec), smokedec->srcpad);
diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c
index cd499f85..c1d94cbc 100644
--- a/ext/jpeg/gstsmokeenc.c
+++ b/ext/jpeg/gstsmokeenc.c
@@ -168,16 +168,15 @@ gst_smokeenc_init (GstSmokeEnc * smokeenc)
{
/* create the sink and src pads */
smokeenc->sinkpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_smokeenc_sink_pad_template), "sink");
+ gst_pad_new_from_static_template (&gst_smokeenc_sink_pad_template,
+ "sink");
gst_pad_set_chain_function (smokeenc->sinkpad, gst_smokeenc_chain);
gst_pad_set_getcaps_function (smokeenc->sinkpad, gst_smokeenc_getcaps);
gst_pad_set_setcaps_function (smokeenc->sinkpad, gst_smokeenc_setcaps);
gst_element_add_pad (GST_ELEMENT (smokeenc), smokeenc->sinkpad);
smokeenc->srcpad =
- gst_pad_new_from_template (gst_static_pad_template_get
- (&gst_smokeenc_src_pad_template), "src");
+ gst_pad_new_from_static_template (&gst_smokeenc_src_pad_template, "src");
gst_pad_set_getcaps_function (smokeenc->sinkpad, gst_smokeenc_getcaps);
gst_pad_use_fixed_caps (smokeenc->sinkpad);
/*gst_pad_set_link_function (smokeenc->sinkpad, gst_smokeenc_link); */