diff options
| author | David Schleef <ds@schleef.org> | 2003-12-11 05:36:46 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-11 05:36:46 +0000 |
| commit | 458a99e2dd99445720e5a7c3e027a609aaa921f9 (patch) | |
| tree | 647e8f642a7f446228a26f1a5f413ba07bbb25ae /gst-libs/gst | |
| parent | 1c2aeb0087f21c8fdaa8fe9e9a200bf1a11c5c6f (diff) | |
| download | gst-plugins-bad-458a99e2dd99445720e5a7c3e027a609aaa921f9.tar.gz gst-plugins-bad-458a99e2dd99445720e5a7c3e027a609aaa921f9.tar.bz2 gst-plugins-bad-458a99e2dd99445720e5a7c3e027a609aaa921f9.zip | |
Fixes to get gst-register working
Original commit message from CVS:
Fixes to get gst-register working
Diffstat (limited to 'gst-libs/gst')
| -rw-r--r-- | gst-libs/gst/audio/audio.h | 21 | ||||
| -rw-r--r-- | gst-libs/gst/video/video.h | 8 |
2 files changed, 14 insertions, 15 deletions
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 1c7828c4..73a4043f 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -64,30 +64,29 @@ G_BEGIN_DECLS /* "standard" int audio is native order, 16 bit stereo. */ #define GST_AUDIO_INT_STANDARD_PAD_TEMPLATE_CAPS \ "audio/x-raw-int, " \ - "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "rate = (int) [ 1, MAX ], " \ "channels = (int) 2, " \ - "endianness = (int) " G_STRINGIFY(G_BYTE_ORDER) ", " \ + "endianness = (int) BYTE_ORDER, " \ "width = (int) 16, " \ "depth = (int) 16, " \ "signed = (boolean) true, " \ - "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" + "buffer-frames = (int) [ 1, MAX]" #define GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS \ "audio/x-raw-float, " \ - "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ - "channels = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ - "endianness = (int) { " G_STRINGIFY(G_LITTLE_ENDIAN) ", " \ - G_STRINGIFY(G_BIG_ENDIAN) "}, " \ + "rate = (int) [ 1, MAX ], " \ + "channels = (int) [ 1, MAX ], " \ + "endianness = (int) { LITTLE_ENDIAN , BIG_ENDIAN }, " \ "width = (int) { 32, 64 }, " \ - "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" + "buffer-frames = (int) [ 1, MAX]" /* "standard" float audio is native order, 32 bit mono. */ #define GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS \ "audio/x-raw-float, " \ - "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "rate = (int) [ 1, MAX ], " \ "channels = (int) 1, " \ - "endianness = (int) " G_STRINGIFY(G_BYTE_ORDER) ", " \ - "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" + "endianness = (int) BYTE_ORDER, " \ + "buffer-frames = (int) [ 1, MAX]" /* * this library defines and implements some helper functions for audio diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index 21349481..fb64271b 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -31,9 +31,9 @@ #define G_MASK_32_REVERSE 0x0000ff00 #define B_MASK_32_REVERSE 0x00ff0000 -#define R_MASK_24 0xff0000 -#define G_MASK_24 0x00ff00 -#define B_MASK_24 0x0000ff +#define R_MASK_24 "0xff0000" +#define G_MASK_24 "0x00ff00" +#define B_MASK_24 "0x0000ff" #define R_MASK_24_REVERSE 0x0000ff #define G_MASK_24_REVERSE 0x00ff00 @@ -111,7 +111,7 @@ "video/x-raw-rgb, " \ "bpp = (int) 32, " \ "depth = (int) 32, " \ - "endianness = (int) " G_STRINGIFY(G_BIG_ENDIAN) ", " \ + "endianness = (int) BIG_ENDIAN, " \ "red_mask = (int) " R_MASK_32 ", " \ "green_mask = (int) " G_MASK_32 ", " \ "blue_mask = (int) " B_MASK_32 ", " \ |