summaryrefslogtreecommitdiffstats
path: root/ext/libcaca
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-01-12 03:21:40 +0000
committerDavid Schleef <ds@schleef.org>2004-01-12 03:21:40 +0000
commit733fcc462974ffad4f1483f5ff1ef4fac3d8359c (patch)
treee443deae6d2515b3fa2c938a76852f3317b276a6 /ext/libcaca
parent409384e0d8e96e2570199ed9397bcd7a86e7f2bf (diff)
Fixes to make ext/libcaca compile.
Original commit message from CVS: * configure.ac: * ext/Makefile.am: Fixes to make ext/libcaca compile. * ext/divx/gstdivxdec.c: * ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_link), (gst_gdk_pixbuf_init), (gst_gdk_pixbuf_chain): Make gdkpixbufdec handle images that span multiple buffers. Now work with both filesrc ! gdkpixbufdec and qtdemux ! gdkpixbufdec. * ext/gdk_pixbuf/gstgdkpixbuf.h: * ext/libcaca/gstcacasink.h: Fixes needed due to recent video/video.h changes * ext/xvid/gstxvid.c: (gst_xvid_csp_to_caps): same * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get), (gst_v4lmjpegsrc_buffer_free): Use buffer free function instead of GstData free function. * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_get), (gst_v4lsrc_buffer_free): same.
Diffstat (limited to 'ext/libcaca')
-rw-r--r--ext/libcaca/gstcacasink.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h
index 3a6e7bfe..4d1e1c0d 100644
--- a/ext/libcaca/gstcacasink.h
+++ b/ext/libcaca/gstcacasink.h
@@ -34,9 +34,9 @@ extern "C" {
#define GST_CACA_DEFAULT_SCREEN_WIDTH 80
#define GST_CACA_DEFAULT_SCREEN_HEIGHT 25
#define GST_CACA_DEFAULT_BPP 24
-#define GST_CACA_DEFAULT_RED_MASK R_MASK_32_INT
-#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_INT
-#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32_INT
+#define GST_CACA_DEFAULT_RED_MASK GST_VIDEO_BYTE1_MASK_32_INT
+#define GST_CACA_DEFAULT_GREEN_MASK GST_VIDEO_BYTE2_MASK_32_INT
+#define GST_CACA_DEFAULT_BLUE_MASK GST_VIDEO_BYTE3_MASK_32_INT
//#define GST_CACA_DEFAULT_RED_MASK R_MASK_32_REVERSE_INT
//#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_REVERSE_INT