From 0475cf26131ccb8e8488625e45e92ea53e01b9bf Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 23 Dec 2003 22:50:06 +0000 Subject: Fix caps breakage after Dave's caps branch merge. Original commit message from CVS: 2003-12-23 Ronald Bultje * 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. --- ext/mpeg2enc/gstmpeg2encoder.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ext/mpeg2enc/gstmpeg2encoder.cc') diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc index e0952db1..b1c2b8ef 100644 --- a/ext/mpeg2enc/gstmpeg2encoder.cc +++ b/ext/mpeg2enc/gstmpeg2encoder.cc @@ -85,11 +85,11 @@ GstMpeg2Encoder::getFormat () { gdouble fps = Y4M_RATIO_DBL (mpeg_framerate (options.frame_rate)); - return GST_CAPS_NEW ("mpeg2enc_src", - "video/mpeg", - "systemstream", GST_PROPS_BOOLEAN (FALSE), - "mpegversion", GST_PROPS_INT (options.mpeg), - "width", GST_PROPS_INT (options.in_img_width), - "height", GST_PROPS_INT (options.in_img_height), - "framerate", GST_PROPS_FLOAT (fps)); + return gst_caps_new_simple ("video/mpeg", + "systemstream", G_TYPE_BOOLEAN, FALSE, + "mpegversion", G_TYPE_INT, options.mpeg, + "width", G_TYPE_INT, options.in_img_width, + "height", G_TYPE_INT, options.in_img_height, + "framerate", G_TYPE_DOUBLE, fps, + NULL); } -- cgit v1.2.1