mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM BAD 48/68] colorspace: fix build with current git of gst-plugins-base

Browse source 
ifdef tests don't work so well if we define them in the code
above in case they aren't defined.
This commit is contained in:
Tim-Philipp Müller 2010-11-02 16:54:59 +00:00 committed by Wim Taymans
parent 3c106bad31
commit e857835fe8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/colorspace/gstcolorspace.c
View file

@ -46,12 +46,14 @@ GST_DEBUG_CATEGORY (colorspace_debug);
#define GST_CAT_DEFAULT colorspace_debug #define GST_CAT_DEFAULT colorspace_debug
GST_DEBUG_CATEGORY (colorspace_performance); GST_DEBUG_CATEGORY (colorspace_performance);
#ifndef GST_VIDEO_CAPS_RGB8_PALETTED #ifdef GST_VIDEO_CAPS_RGB8_PALETTED
#define GST_VIDEO_CAPS_RGB8_PALETTED \ #define VIDEO_CAPS_RGB8_PALETTED \
"video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \ "video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \
"width = "GST_VIDEO_SIZE_RANGE" , " \ "width = "GST_VIDEO_SIZE_RANGE" , " \
"height = " GST_VIDEO_SIZE_RANGE ", " \ "height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = "GST_VIDEO_FPS_RANGE "framerate = "GST_VIDEO_FPS_RANGE "; "
#else
#define VIDEO_CAPS_RGB8_PALETTED /* no-op */
#endif #endif
#define CSP_VIDEO_CAPS \ #define CSP_VIDEO_CAPS \
@ -72,7 +74,7 @@ GST_DEBUG_CATEGORY (colorspace_performance);
GST_VIDEO_CAPS_BGR_16";" \ GST_VIDEO_CAPS_BGR_16";" \
GST_VIDEO_CAPS_RGB_15";" \ GST_VIDEO_CAPS_RGB_15";" \
GST_VIDEO_CAPS_BGR_15";" \ GST_VIDEO_CAPS_BGR_15";" \
GST_VIDEO_CAPS_RGB8_PALETTED";" \ VIDEO_CAPS_RGB8_PALETTED \
GST_VIDEO_CAPS_GRAY8";" \ GST_VIDEO_CAPS_GRAY8";" \
GST_VIDEO_CAPS_GRAY16("BIG_ENDIAN")";" \ GST_VIDEO_CAPS_GRAY16("BIG_ENDIAN")";" \
GST_VIDEO_CAPS_GRAY16("LITTLE_ENDIAN")";" GST_VIDEO_CAPS_GRAY16("LITTLE_ENDIAN")";"