diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-01-11 19:34:15 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-01-11 19:34:15 +0000 |
| commit | ff11b1036d6b71b2c4adae91385c93d78a395e8e (patch) | |
| tree | 910d199ac5289605afca51486641caa9b8f48c9b | |
| parent | 96bbccf5ef4a625f953477f0b12c20040b61ed31 (diff) | |
| download | gst-plugins-bad-ff11b1036d6b71b2c4adae91385c93d78a395e8e.tar.gz gst-plugins-bad-ff11b1036d6b71b2c4adae91385c93d78a395e8e.tar.bz2 gst-plugins-bad-ff11b1036d6b71b2c4adae91385c93d78a395e8e.zip | |
I'm too lazy to comment this
Original commit message from CVS:
*** empty log message ***
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst-libs/gst/video/video.h | 28 |
2 files changed, 13 insertions, 22 deletions
@@ -1,5 +1,12 @@ 2004-01-11 Benjamin Otte <in7y118@public.uni-hamburg.de> + * gst-libs/gst/video/video.h: + Fix 32bit caps. Issue remaining: The macro names are chosen poorly. + They should probably be like + GST_VIDEO_PAD_TEMPLATE_CAPS_{RGB,BGR,RGBx,BGRx}. + +2004-01-11 Benjamin Otte <in7y118@public.uni-hamburg.de> + * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header), (qtdemux_parse_trak): fix audio chunk size/timestamp calculation diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index 7f5a1fdf..669a6a54 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -76,33 +76,17 @@ /* properties for pad templates */ #define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 \ - "video/x-raw-rgb, " \ - "bpp = (int) { 24, 32 }, " \ - "depth = (int) { 24, 32 }, " \ - "endianness = (int) BIG_ENDIAN, " \ - "red_mask = (int) { " R_MASK_32 ", " R_MASK_24 " }, " \ - "green_mask = (int) { " G_MASK_32 ", " G_MASK_24 " }, " \ - "blue_mask = (int) { " B_MASK_32 ", " B_MASK_24 " }, " \ - "width = " SIZE_RANGE ", " \ - "height = " SIZE_RANGE ", " \ - "framerate = " FPS_RANGE + GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 "; " \ + GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24 #define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE \ - "video/x-raw-rgb, " \ - "bpp = (int) { 24, 32 }, " \ - "depth = (int) { 24, 32 }, " \ - "endianness = (int) BIG_ENDIAN, " \ - "red_mask = (int) { " R_MASK_32_REVERSE ", " R_MASK_24_REVERSE "}, " \ - "green_mask = (int) { " G_MASK_32_REVERSE ", " G_MASK_24_REVERSE "}, " \ - "blue_mask = (int) { " B_MASK_32_REVERSE ", " B_MASK_24_REVERSE "}, " \ - "width = " SIZE_RANGE ", " \ - "height = " SIZE_RANGE ", " \ - "framerate = " FPS_RANGE + GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32_REVERSE "; " \ + GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_REVERSE #define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 \ "video/x-raw-rgb, " \ "bpp = (int) 32, " \ - "depth = (int) 32, " \ + "depth = (int) 24, " \ "endianness = (int) BIG_ENDIAN, " \ "red_mask = (int) " R_MASK_32 ", " \ "green_mask = (int) " G_MASK_32 ", " \ @@ -126,7 +110,7 @@ #define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32_REVERSE \ "video/x-raw-rgb, " \ "bpp = (int) 32, " \ - "depth = (int) 32, " \ + "depth = (int) 24, " \ "endianness = (int) BIG_ENDIAN, " \ "red_mask = (int) " R_MASK_32_REVERSE ", " \ "green_mask = (int) " G_MASK_32_REVERSE ", " \ |