diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-23 22:50:06 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-23 22:50:06 +0000 |
| commit | 0475cf26131ccb8e8488625e45e92ea53e01b9bf (patch) | |
| tree | e86516321658b9156bde05ece2ea550f3cd8b8ae /sys/dxr3/dxr3videosink.c | |
| parent | d3def8f8f2c9ca01c0b3c4b8236b277323982457 (diff) | |
| download | gst-plugins-bad-0475cf26131ccb8e8488625e45e92ea53e01b9bf.tar.gz gst-plugins-bad-0475cf26131ccb8e8488625e45e92ea53e01b9bf.tar.bz2 gst-plugins-bad-0475cf26131ccb8e8488625e45e92ea53e01b9bf.zip | |
Fix caps breakage after Dave's caps branch merge.
Original commit message from CVS:
2003-12-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/divx/gstdivxdec.c: (gst_divxdec_base_init),
(gst_divxdec_init), (gst_divxdec_negotiate):
* ext/divx/gstdivxdec.h:
* ext/divx/gstdivxenc.c: (gst_divxenc_base_init),
(gst_divxenc_init):
* ext/faac/gstfaac.c: (gst_faac_base_init), (gst_faac_init),
(gst_faac_sinkconnect), (gst_faac_srcconnect):
* ext/mpeg2enc/gstmpeg2enc.cc:
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_base_init),
(dxr3audiosink_init), (dxr3audiosink_pcm_sinklink):
* sys/dxr3/dxr3spusink.c: (dxr3spusink_base_init),
(dxr3spusink_init):
* sys/dxr3/dxr3videosink.c: (dxr3videosink_base_init),
(dxr3videosink_init):
Fix caps breakage after Dave's caps branch merge.
Diffstat (limited to 'sys/dxr3/dxr3videosink.c')
| -rw-r--r-- | sys/dxr3/dxr3videosink.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index eb08aae0..596a3831 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -78,23 +78,19 @@ enum { #define START_CODE_SEQUENCE_HEADER 0xB3 #define START_CODE_SEQUENCE_END 0xB7 - -GST_PAD_TEMPLATE_FACTORY (dxr3videosink_sink_factory, +static GstStaticPadTemplate dxr3videosink_sink_factory = +GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_CAPS_NEW ( - "dxr3videosink_sink", - "video/mpeg", - "mpegversion", GST_PROPS_LIST ( - GST_PROPS_INT (1), - GST_PROPS_INT (2) - ), - "systemstream", GST_PROPS_BOOLEAN (FALSE) + GST_STATIC_CAPS ( + "video/mpeg, " + "mpegversion = (int) { 1, 2 }, " + "systemstream = (boolean) FALSE" /* width/height/framerate omitted, we don't * need a parsed stream */ ) -) +); GST_PAD_EVENT_MASK_FUNCTION (dxr3videosink_get_event_mask, @@ -178,7 +174,7 @@ dxr3videosink_base_init (Dxr3VideoSinkClass *klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, - GST_PAD_TEMPLATE_GET (dxr3videosink_sink_factory)); + gst_static_pad_template_get (&dxr3videosink_sink_factory)); gst_element_class_set_details (element_class, &dxr3videosink_details); } @@ -218,7 +214,7 @@ dxr3videosink_init (Dxr3VideoSink *sink) GstPad *pad; pad = gst_pad_new_from_template ( - GST_PAD_TEMPLATE_GET (dxr3videosink_sink_factory), "sink"); + gst_static_pad_template_get (&dxr3videosink_sink_factory), "sink"); gst_element_add_pad (GST_ELEMENT (sink), pad); gst_pad_set_chain_function (pad, dxr3videosink_chain); |