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 | |
| 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.
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/divx/gstdivxdec.c | 8 | ||||
| -rw-r--r-- | ext/xvid/gstxvid.c | 8 |
4 files changed, 39 insertions, 4 deletions
@@ -1,3 +1,22 @@ +2004-01-11 David Schleef <ds@schleef.org> + + * 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. + 2004-01-12 Benjamin Otte <in7y118@public.uni-hamburg.de> * sys/v4l2/gstv4l2element.c: (gst_v4l2element_class_init), diff --git a/ext/Makefile.am b/ext/Makefile.am index ec6955bb..a5e112cb 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -154,6 +154,12 @@ else LCS_DIR= endif +if USE_LIBCACA +LIBCACA_DIR=libcaca +else +LIBCACA_DIR= +endif + if USE_LIBDV LIBDV_DIR=dv else @@ -323,6 +329,7 @@ SUBDIRS=\ $(LADSPA_DIR) \ $(LAME_DIR) \ $(LCS_DIR) \ + $(LIBCACA_DIR) \ $(LIBDV_DIR) \ $(LIBFAME_DIR) \ $(LIBPNG_DIR) \ @@ -376,6 +383,7 @@ DIST_SUBDIRS=\ ladspa \ lame \ lcs \ + libcaca \ libfame \ libpng \ librfb \ 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", diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c index 49d2ecb3..a8060fb6 100644 --- a/ext/xvid/gstxvid.c +++ b/ext/xvid/gstxvid.c @@ -196,11 +196,15 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps) switch (csp) { case XVID_CSP_RGB555: - r_mask = R_MASK_15_INT; g_mask = G_MASK_15_INT; b_mask = B_MASK_15_INT; + r_mask = GST_VIDEO_RED_MASK_15_INT; + g_mask = GST_VIDEO_GREEN_MASK_15_INT; + b_mask = GST_VIDEO_BLUE_MASK_15_INT; endianness = G_BYTE_ORDER; depth = 15; bpp = 16; break; case XVID_CSP_RGB565: - r_mask = R_MASK_16_INT; g_mask = G_MASK_16_INT; b_mask = B_MASK_16_INT; + r_mask = GST_VIDEO_RED_MASK_16_INT; + g_mask = GST_VIDEO_GREEN_MASK_16_INT; + b_mask = GST_VIDEO_BLUE_MASK_16_INT; endianness = G_BYTE_ORDER; depth = 16; bpp = 16; break; case XVID_CSP_BGR: |