diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | examples/Makefile.am | 8 | ||||
| -rw-r--r-- | gst/mpeg1sys/systems.c | 4 | ||||
| -rw-r--r-- | gst/rtjpeg/RTjpeg.c | 2 | ||||
| -rw-r--r-- | sys/Makefile.am | 12 |
6 files changed, 39 insertions, 7 deletions
@@ -1,3 +1,16 @@ +2004-05-18 David Schleef <ds@schleef.org> + + * configure.ac: Add sunaudio + * examples/Makefile.am: make gstplay depend on gconf + * gst/ffmpegcolorspace/gstffmpegcodecmap.c: Remove c99-isms + * gst/ffmpegcolorspace/imgconvert.c: (build_rgb_palette), + (convert_table_lookup), (img_convert): remove c99-isms + * gst/ffmpegcolorspace/imgconvert_template.h: make a constant + unsigned, to fix a warning on Solaris + * gst/mpeg1sys/systems.c: bcopy->memcpy + * gst/rtjpeg/RTjpeg.c: (RTjpeg_yuvrgb8): bcopy->memcpy + * sys/Makefile.am: Add sunaudio + 2004-05-18 Wim Taymans <wim@fluendo.com> * ext/ogg/gstoggmux.c: (gst_ogg_mux_get_type), (gst_ogg_mux_init), diff --git a/configure.ac b/configure.ac index e9ba37152..ee312d3dd 100644 --- a/configure.ac +++ b/configure.ac @@ -461,6 +461,12 @@ GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [ fi ]) +dnl *** Sun Audio *** +translit(dnm, m, l) AM_CONDITIONAL(USE_SUNAUDIO, true) +GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudiosrc, [ + AC_CHECK_HEADER(sys/audioio.h, HAVE_SUNAUDIO="yes", HAVE_SUNAUDIO="no") +]) + dnl *** Video CD *** translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true) GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [ @@ -1786,6 +1792,7 @@ sys/dxr3/Makefile sys/glsink/Makefile sys/oss/Makefile sys/qcam/Makefile +sys/sunaudio/Makefile sys/v4l/Makefile sys/v4l2/Makefile sys/vcd/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index d2537f292..0c8190c7b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -10,5 +10,11 @@ else GTK_SUBDIRS= endif -SUBDIRS=$(GTK_SUBDIRS) gstplay switch +if USE_GCONF +GCONF_SUBDIRS=gstplay +else +GCONF_SUBDIRS= +endif + +SUBDIRS=$(GTK_SUBDIRS) $(GCONF_SUBDIRS) switch DIST_SUBDIRS=capsfilter dynparams seeking indexing gstplay switch diff --git a/gst/mpeg1sys/systems.c b/gst/mpeg1sys/systems.c index c0541c5ba..6cff50348 100644 --- a/gst/mpeg1sys/systems.c +++ b/gst/mpeg1sys/systems.c @@ -70,7 +70,7 @@ create_sector (sector, pack, sys_header, if (pack != NULL) { i = sizeof (pack->buf); - bcopy (pack->buf, index, i); + memcpy (index, pack->buf, i); index += i; sector->length_of_sector += i; } @@ -84,7 +84,7 @@ create_sector (sector, pack, sys_header, if (which_streams != STREAMS_BOTH) i -= 3; - bcopy (sys_header->buf, index, i); + memcpy (index, sys_header->buf, i); index += i; sector->length_of_sector += i; } diff --git a/gst/rtjpeg/RTjpeg.c b/gst/rtjpeg/RTjpeg.c index f2f61252c..eaf8a5ab9 100644 --- a/gst/rtjpeg/RTjpeg.c +++ b/gst/rtjpeg/RTjpeg.c @@ -3370,7 +3370,7 @@ RTjpeg_yuvrgb16 (__u8 * buf, __u8 * rgb) void RTjpeg_yuvrgb8 (__u8 * buf, __u8 * rgb) { - bcopy (buf, rgb, RTjpeg_width * RTjpeg_height); + memcpy (rgb, buf, RTjpeg_width * RTjpeg_height); } void diff --git a/sys/Makefile.am b/sys/Makefile.am index ff5138485..96563de01 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -16,6 +16,12 @@ else QCAM_DIR= endif +if USE_SUNAUDIO +SUNAUDIO_DIR=sunaudio +else +SUNAUDIO_DIR= +endif + if USE_V4L V4L_DIR=v4l else @@ -52,7 +58,7 @@ else CDROM_DIR= endif -SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \ - $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR) +SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(SUNAUDIO_DIR) $(QCAM_DIR) $(V4L_DIR) \ + $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR) -DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd ximage xvimage glsink cdrom +DIST_SUBDIRS=dxr3 oss qcam sunaudio v4l v4l2 vcd ximage xvimage glsink cdrom |