diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2009-08-31 18:10:11 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-31 18:11:28 +0200 |
| commit | fbefd9c66623b3f6e967aa52c6de270dbd368011 (patch) | |
| tree | 8245bfabf7aa1a002b894e7e482bf412913ae81e /gst/effectv/gstop.c | |
| parent | ed3e870b92bd5be9587280ef0c38a89d4b5d3bc7 (diff) | |
effectv: Fix compilation with gcc 3
Recent changes in gst-plugins-good/gst/effectv prevents it from being compiled
with gcc 3. The problem is that the new code uses preprocessor conditionals
within a macro call which does not work with older versions of gcc.
Fixes bug #593688.
Diffstat (limited to 'gst/effectv/gstop.c')
| -rw-r--r-- | gst/effectv/gstop.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gst/effectv/gstop.c b/gst/effectv/gstop.c index 465eb955..b371ba76 100644 --- a/gst/effectv/gstop.c +++ b/gst/effectv/gstop.c @@ -97,26 +97,24 @@ static guint32 palette[256]; GST_BOILERPLATE (GstOpTV, gst_optv, GstVideoFilter, GST_TYPE_VIDEO_FILTER); -static GstStaticPadTemplate gst_optv_src_template = - GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, #if G_BYTE_ORDER == G_LITTLE_ENDIAN - GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx "; " GST_VIDEO_CAPS_RGBx) +#define CAPS_STR GST_VIDEO_CAPS_BGRx ";" GST_VIDEO_CAPS_RGBx #else - GST_STATIC_CAPS (GST_VIDEO_CAPS_xBGR "; " GST_VIDEO_CAPS_xRGB) +#define CAPS_STR GST_VIDEO_CAPS_xBGR ";" GST_VIDEO_CAPS_xRGB #endif + +static GstStaticPadTemplate gst_optv_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (CAPS_STR) ); static GstStaticPadTemplate gst_optv_sink_template = - GST_STATIC_PAD_TEMPLATE ("sink", +GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx "; " GST_VIDEO_CAPS_RGBx) -#else - GST_STATIC_CAPS (GST_VIDEO_CAPS_xBGR "; " GST_VIDEO_CAPS_xRGB) -#endif + GST_STATIC_CAPS (CAPS_STR) ); static void |