diff options
| author | David Schleef <ds@schleef.org> | 2004-01-12 03:21:40 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-12 03:21:40 +0000 |
| commit | 538adea7fa1756c41e55c3b3e7f4bc9f6d206cfc (patch) | |
| tree | 1cbfbad63371ae6900f4e36a273a5e75194a3067 /ext/divx | |
| parent | 1adb86a5d6b2f1bb96568f6135e1fdb4d451e4cd (diff) | |
| download | gst-plugins-bad-538adea7fa1756c41e55c3b3e7f4bc9f6d206cfc.tar.gz gst-plugins-bad-538adea7fa1756c41e55c3b3e7f4bc9f6d206cfc.tar.bz2 gst-plugins-bad-538adea7fa1756c41e55c3b3e7f4bc9f6d206cfc.zip | |
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/divx')
| -rw-r--r-- | ext/divx/gstdivxdec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index a61466c7..bd9deb8d 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -369,11 +369,15 @@ gst_divxdec_negotiate (GstDivxDec *divxdec) break; case 24: endianness = G_BIG_ENDIAN; - r_mask = R_MASK_24; g_mask = G_MASK_24; b_mask = B_MASK_24; + r_mask = GST_VIDEO_BYTE1_MASK_24_INT; + g_mask = GST_VIDEO_BYTE2_MASK_24_INT; + b_mask = GST_VIDEO_BYTE3_MASK_24_INT break; case 32: endianness = G_BIG_ENDIAN; - r_mask = R_MASK_32; g_mask = G_MASK_32; b_mask = B_MASK_32; + r_mask = GST_VIDEO_BYTE1_MASK_32_INT; + g_mask = GST_VIDEO_BYTE2_MASK_32_INT; + b_mask = GST_VIDEO_BYTE3_MASK_32_INT break; } caps = GST_CAPS_NEW("divxdec_src_pad_rgb", |