mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

tiger: move #if #else bits outside of macro

Browse source 
Some compilers/preprocessors don't like if/else/endif preprocessor
directives in the middle of macros.
This commit is contained in:
Tim-Philipp Müller 2010-12-25 16:44:03 +00:00
parent e35a3ddbf9
commit 5dac64b20a
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/kate/gstkatetiger.c
View file

@ -131,30 +131,26 @@ static GstStaticPadTemplate kate_sink_factory =
GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate") GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate")
); );
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define TIGER_VIDEO_CAPS \
GST_VIDEO_CAPS_xRGB ", endianness = (int)1234; " \
GST_VIDEO_CAPS_BGRx ", endianness = (int)4321"
#else
#define TIGER_VIDEO_CAPS \
GST_VIDEO_CAPS_BGRx ", endianness = (int)4321; " \
GST_VIDEO_CAPS_xRGB ", endianness = (int)1234"
#endif
static GstStaticPadTemplate video_sink_factory = static GstStaticPadTemplate video_sink_factory =
GST_STATIC_PAD_TEMPLATE ("video_sink", GST_STATIC_PAD_TEMPLATE ("video_sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
#if G_BYTE_ORDER == G_LITTLE_ENDIAN GST_STATIC_CAPS (TIGER_VIDEO_CAPS));
GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB ", endianness = (int) 1234" ";"
GST_VIDEO_CAPS_BGRx ", endianness = (int)4321")
#else
GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB ", endianness = (int) 4321" ";"
GST_VIDEO_CAPS_BGRx ", endianness = (int)1234")
#endif
);
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
#if G_BYTE_ORDER == G_LITTLE_ENDIAN GST_STATIC_CAPS (TIGER_VIDEO_CAPS));
GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB ", endianness = (int) 1234" ";"
GST_VIDEO_CAPS_BGRx ", endianness = (int)4321")
#else
GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB ", endianness = (int) 4321" ";"
GST_VIDEO_CAPS_BGRx ", endianness = (int)1234")
#endif
);
GST_BOILERPLATE (GstKateTiger, gst_kate_tiger, GstElement, GST_TYPE_ELEMENT); GST_BOILERPLATE (GstKateTiger, gst_kate_tiger, GstElement, GST_TYPE_ELEMENT);