diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2003-12-21 22:43:09 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2003-12-21 22:43:09 +0000 |
| commit | 76a6e90a42a3a2e8b7cea615253cfb16d63d72b0 (patch) | |
| tree | 8e81ae718175ff6786dec26fd66fd02a2a6e1db4 | |
| parent | a47a4d1f17d5154d4e00722eaca22b7b247bdfb5 (diff) | |
Port lame, libfame and xvid to new CAPS
Original commit message from CVS:
Port lame, libfame and xvid to new CAPS
Fix varargs in jpegdec and pngenc
Make GstStaticPadTemplates static in gsmdec
Add integer versions of the RGB masks in video.h
Fix inverted logic in gstvideotestsrc
| -rw-r--r-- | gst-libs/gst/video/video.h | 24 | ||||
| -rw-r--r-- | gst/videotestsrc/gstvideotestsrc.c | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index d10f6d42c..7f5a1fdf4 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -47,6 +47,30 @@ #define G_MASK_15 "0x03e0" #define B_MASK_15 "0x001f" +#define R_MASK_32_INT 0xff000000 +#define G_MASK_32_INT 0x00ff0000 +#define B_MASK_32_INT 0x0000ff00 + +#define R_MASK_32_REVERSE_INT 0x000000ff +#define G_MASK_32_REVERSE_INT 0x0000ff00 +#define B_MASK_32_REVERSE_INT 0x00ff0000 + +#define R_MASK_24_INT 0xff0000 +#define G_MASK_24_INT 0x00ff00 +#define B_MASK_24_INT 0x0000ff + +#define R_MASK_24_REVERSE_INT 0x0000ff +#define G_MASK_24_REVERSE_INT 0x00ff00 +#define B_MASK_24_REVERSE_INT 0xff0000 + +#define R_MASK_16_INT 0xf800 +#define G_MASK_16_INT 0x07e0 +#define B_MASK_16_INT 0x001f + +#define R_MASK_15_INT 0x7c00 +#define G_MASK_15_INT 0x03e0 +#define B_MASK_15_INT 0x001f + #define SIZE_RANGE "(int) [ 16, 4096 ]" #define FPS_RANGE "(double) [ 0, max ]" diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 2ce3f5997..017b9ebf0 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -428,7 +428,7 @@ gst_videotestsrc_get (GstPad * pad) videotestsrc = GST_VIDEOTESTSRC (gst_pad_get_parent (pad)); - if (videotestsrc->fourcc != NULL) { + if (videotestsrc->fourcc == NULL) { gst_element_error (GST_ELEMENT (videotestsrc), "No color format set - aborting"); return NULL; |