David Schleef [Wed, 7 Jan 2004 21:36:52 +0000 (21:36 +0000)]
Handle builddir != srcdir builds with making gstvideoexample.c
Original commit message from CVS:
Handle builddir != srcdir builds with making gstvideoexample.c
David Schleef [Wed, 7 Jan 2004 21:33:01 +0000 (21:33 +0000)]
Fix the regular expressions and quote properly
Original commit message from CVS:
Fix the regular expressions and quote properly
David Schleef [Wed, 7 Jan 2004 21:07:12 +0000 (21:07 +0000)]
Convert make_filter to sh. Add make_filter's id to the output
Original commit message from CVS:
Convert make_filter to sh. Add make_filter's id to the output
Thomas Vander Stichele [Wed, 7 Jan 2004 16:50:31 +0000 (16:50 +0000)]
fix element description
Original commit message from CVS:
fix element description
Julien Moutte [Wed, 7 Jan 2004 15:33:41 +0000 (15:33 +0000)]
examples/gstplay/player.c: Adding some new lines in g_print calls.
Original commit message from CVS:
* examples/gstplay/player.c: (got_time_tick), (got_stream_length),
(got_video_size): Adding some new lines in g_print calls.
* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_new),
(gst_ximagesink_xwindow_destroy), (gst_ximagesink_xwindow_resize),
(gst_ximagesink_handle_xevents), (gst_ximagesink_fixate),
(gst_ximagesink_sinkconnect), (gst_ximagesink_change_state),
(gst_ximagesink_chain), (gst_ximagesink_buffer_new),
(gst_ximagesink_set_xwindow_id), (gst_ximagesink_get_desired_size):
Complete code review, reverting some stuff i disagree with, adding
some fixes : time synchronization on invalid timestamps, renegotiation
of private window.
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xwindow_destroy),
(gst_xvimagesink_xwindow_resize), (gst_xvimagesink_handle_xevents),
(gst_xvimagesink_get_xv_support), (gst_xvimagesink_xcontext_get),
(gst_xvimagesink_fixate), (gst_xvimagesink_sinkconnect),
(gst_xvimagesink_change_state), (gst_xvimagesink_chain),
(gst_xvimagesink_buffer_new),
(gst_xvimagesink_navigation_send_event),
(gst_xvimagesink_set_xwindow_id),
(gst_xvimagesink_get_desired_size),
(gst_xvimagesink_xoverlay_init): Complete code review, reverting some
stuff i disagree with, adding some fixes : Renegotiation of private
window, implementing get_desired_size.
Ronald S. Bultje [Wed, 7 Jan 2004 13:18:08 +0000 (13:18 +0000)]
Fix for instantiate-test (see core). Also remove dead code from jpegenc (which still needs fixing, but that's lower o...
Original commit message from CVS:
2004-01-07 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/audiofile/gstafsink.c: (gst_afsink_init), (gst_afsink_chain),
(gst_afsink_handle_event):
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_init):
* gst/avi/gstavimux.c: (gst_avimux_request_new_pad):
* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_init):
* sys/dxr3/dxr3spusink.c: (dxr3spusink_init):
* sys/dxr3/dxr3videosink.c: (dxr3videosink_init):
Fix for instantiate-test (see core). Also remove dead code from
jpegenc (which still needs fixing, but that's lower on my TODO
list...).
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
Never return NULL as caps.
Julien Moutte [Wed, 7 Jan 2004 13:04:40 +0000 (13:04 +0000)]
gstvideoexample.h disappeared. fixing build.
Original commit message from CVS:
gstvideoexample.h disappeared. fixing build.
David Schleef [Wed, 7 Jan 2004 10:51:05 +0000 (10:51 +0000)]
New source plugin based on librfb-0.1. RFB (remote framebuffer) is the protocol used by VNC.
Original commit message from CVS:
New source plugin based on librfb-0.1. RFB (remote framebuffer)
is the protocol used by VNC.
David Schleef [Wed, 7 Jan 2004 10:16:09 +0000 (10:16 +0000)]
Make warpTV a subclass of videofilter
Original commit message from CVS:
Make warpTV a subclass of videofilter
David Schleef [Wed, 7 Jan 2004 08:56:45 +0000 (08:56 +0000)]
Merge gstvideotemplate.h into gstvideotemplate.c
Original commit message from CVS:
Merge gstvideotemplate.h into gstvideotemplate.c
Benjamin Otte [Wed, 7 Jan 2004 03:06:19 +0000 (03:06 +0000)]
ext/mad/gstid3tag.c: Add guard against invalid utf-8 conversions in mad. Just in case.
Original commit message from CVS:
2004-01-07 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list):
Add guard against invalid utf-8 conversions in mad. Just in case.
Benjamin Otte [Tue, 6 Jan 2004 23:42:37 +0000 (23:42 +0000)]
sys/oss/gstosssink.c: Fix for bug shown by poisoning
Original commit message from CVS:
2004-01-07 Benjamin Otte <in7y118@public.uni-hamburg.de>
* sys/oss/gstosssink.c: (gst_osssink_sink_fixate):
Fix for bug shown by poisoning
Ronald S. Bultje [Tue, 6 Jan 2004 20:15:21 +0000 (20:15 +0000)]
sys/v4l/: Fix for removed bufferpools.
Original commit message from CVS:
2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get),
(gst_v4lmjpegsrc_buffer_free):
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps),
(gst_v4lsrc_srcconnect), (gst_v4lsrc_getcaps), (gst_v4lsrc_get),
(gst_v4lsrc_buffer_free):
Fix for removed bufferpools.
Jan Schmidt [Tue, 6 Jan 2004 16:42:09 +0000 (16:42 +0000)]
ext/dv/gstdvdec.c: Fix caps negotiation.
Original commit message from CVS:
* ext/dv/gstdvdec.c: (gst_dvdec_loop):
Fix caps negotiation.
* ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_class_init),
(dvdnavsrc_update_buttoninfo), (dvdnavsrc_get),
(dvdnavsrc_get_event_mask), (dvdnav_handle_navigation_event),
(dvdnavsrc_event):
* ext/mpeg2dec/gstmpeg2dec.c:
* gst-libs/gst/navigation/navigation.c:
(gst_navigation_send_key_event), (gst_navigation_send_mouse_event):
* gst-libs/gst/navigation/navigation.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_handle_src_event):
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_handle_xevents):
Super-simple first version of mouse and keyboard events. Clicking
on a DVD menu now works, although it may not take you where you
expected.
* gst/sine/gstsinesrc.c: (gst_sinesrc_src_fixate):
* gst/videotestsrc/gstvideotestsrc.c:
(gst_videotestsrc_src_fixate):
These fixate functions were broken - they never actually
fixated :)
Ronald S. Bultje [Tue, 6 Jan 2004 15:59:02 +0000 (15:59 +0000)]
ext/shout/gstshout.c: fix for new caps system.
Original commit message from CVS:
2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/shout/gstshout.c: (gst_icecastsend_base_init),
(gst_icecastsend_init):
fix for new caps system.
* gst-libs/gst/mixer/mixertrack.h:
* sys/oss/gstossmixer.c: (gst_ossmixer_build_list):
Add 'master track' flag (for tools like ACME that only want to
change the main volume).
Jan Schmidt [Tue, 6 Jan 2004 14:34:52 +0000 (14:34 +0000)]
ifdef out ARGB type when it isn't available in xvidcore 1.0.0beta2
Original commit message from CVS:
ifdef out ARGB type when it isn't available in xvidcore 1.0.0beta2
Ronald S. Bultje [Tue, 6 Jan 2004 12:31:31 +0000 (12:31 +0000)]
gst/mpegstream/gstmpegparse.c: When we have received a new SCR right in the first buffer after we should handle the b...
Original commit message from CVS:
2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_loop):
When we have received a new SCR right in the first buffer after
a seek (so in the same cycle that handles the discont), we should
handle the buffer instead of unreffing it, else we lose data.
Iain Holmes [Tue, 6 Jan 2004 00:06:10 +0000 (00:06 +0000)]
Set the buffer-frames on the int2floats caps
Original commit message from CVS:
Set the buffer-frames on the int2floats caps
Make creating srcpads in the oneton smarter.
Ronald S. Bultje [Mon, 5 Jan 2004 11:17:23 +0000 (11:17 +0000)]
gst/mpegstream/gstmpegdemux.c: Add pad to element *after* setting functions such as event handler.
Original commit message from CVS:
2004-01-05 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead):
Add pad to element *after* setting functions such as event handler.
Without this, the scheduler (opt) will link pads, set the event
handler from the default event function (dispatcher in gstpad.c)
and *after* that, we will set our own event function, which will
thus never be used (and thus mpegdemux doesn't handle events).
David Schleef [Sun, 4 Jan 2004 23:46:39 +0000 (23:46 +0000)]
Fix the fixate functions to handle new prototype:
Original commit message from CVS:
Fix the fixate functions to handle new prototype:
* gst/sine/gstsinesrc.c: (gst_sinesrc_src_fixate):
* gst/videotestsrc/gstvideotestsrc.c:
(gst_videotestsrc_src_fixate):
* sys/oss/gstosssink.c: (gst_osssink_sink_fixate):
* sys/ximage/ximagesink.c: (gst_ximagesink_fixate):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_fixate):
Benjamin Otte [Sun, 4 Jan 2004 18:53:53 +0000 (18:53 +0000)]
sys/ximage/ximagesink.*: assorted fixes to make (re)embedding work
Original commit message from CVS:
2004-01-04 Benjamin Otte <in7y118@public.uni-hamburg.de>
* sys/ximage/ximagesink.h:
* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_new),
(gst_ximagesink_xwindow_destroy), (gst_ximagesink_sinkconnect),
(gst_ximagesink_change_state), (gst_ximagesink_set_xwindow_id),
(gst_ximagesink_xoverlay_init):
assorted fixes to make (re)embedding work
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect),
(gst_ximagesink_get_desired_size):
implement desired size additions to XOverlay
Benjamin Otte [Sun, 4 Jan 2004 18:02:30 +0000 (18:02 +0000)]
gst-libs/gst/xoverlay/xoverlay.*: Add optional "desired size" signal and querying.
Original commit message from CVS:
2004-01-04 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_base_init),
(gst_x_overlay_got_xwindow_id), (gst_x_overlay_get_desired_size),
(gst_x_overlay_got_desired_size):
* gst-libs/gst/xoverlay/xoverlay.h:
Add optional "desired size" signal and querying.
Ronald S. Bultje [Sun, 4 Jan 2004 16:04:09 +0000 (16:04 +0000)]
Oops
Original commit message from CVS:
Oops
Ronald S. Bultje [Sun, 4 Jan 2004 15:23:03 +0000 (15:23 +0000)]
gst/matroska/matroska-demux.c: Fix EBML-laced block parsing. Diffs are relative to previous lace, not the first lace....
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/matroska/matroska-demux.c:
Fix EBML-laced block parsing. Diffs are relative to previous
lace, not the first lace. Thanks to Mosu from the Matroska
team for detecting this.
(gst_matroska_demux_parse_blockgroup):
* gst/wavparse/gstwavparse.c: (gst_wavparse_init),
(gst_wavparse_parse_fmt), (gst_wavparse_getcaps),
(gst_wavparse_handle_sink_event), (gst_wavparse_loop),
(gst_wavparse_change_state):
* gst/wavparse/gstwavparse.h:
Quickfix for capsnego.
Ronald S. Bultje [Sun, 4 Jan 2004 12:14:37 +0000 (12:14 +0000)]
gst/wavenc/gstwavenc.c: Fix indenting, fix pad creation.
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/wavenc/gstwavenc.c: (set_property), (gst_wavenc_init):
Fix indenting, fix pad creation.
Ronald S. Bultje [Sun, 4 Jan 2004 09:55:16 +0000 (09:55 +0000)]
ext/xvid/gstxviddec.c: Implement src_getcaps() so proper size caps is negotiated.
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/xvid/gstxviddec.c: (gst_xviddec_init),
(gst_xviddec_src_getcaps), (gst_xviddec_src_link),
(gst_xviddec_sink_link):
Implement src_getcaps() so proper size caps is negotiated.
Ronald S. Bultje [Sat, 3 Jan 2004 23:48:30 +0000 (23:48 +0000)]
ext/flac/gstflacdec.c: Finish flac decoder on EOS. See #116178.
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/flac/gstflacdec.c: (gst_flacdec_loop):
Finish flac decoder on EOS. See #116178.
Ronald S. Bultje [Sat, 3 Jan 2004 23:26:08 +0000 (23:26 +0000)]
gst/matroska/: Add getcaps() function to fix capsnego...
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/matroska/matroska-demux.c: (gst_matroska_demux_src_getcaps),
(gst_matroska_demux_add_stream):
* gst/matroska/matroska-ids.h:
Add getcaps() function to fix capsnego...
Ronald S. Bultje [Sat, 3 Jan 2004 23:07:19 +0000 (23:07 +0000)]
gst/mpegstream/: Fix more integer overflows. Again, see #126967.
Original commit message from CVS:
2004-01-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead),
(gst_mpeg_demux_parse_packet), (gst_mpeg_demux_parse_pes):
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_parse_packhead):
Fix more integer overflows. Again, see #126967.
Ronald S. Bultje [Sat, 3 Jan 2004 22:17:15 +0000 (22:17 +0000)]
ext/mpeg2dec/gstmpeg2dec.c: Add support for mpeg2dec-0.4.0 (released two weeks ago). See #130416.
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/mpeg2dec/gstmpeg2dec.c:
Add support for mpeg2dec-0.4.0 (released two weeks ago). See
#130416.
Ronald S. Bultje [Sat, 3 Jan 2004 19:38:40 +0000 (19:38 +0000)]
Update xvid plugin to latest xvid (1.0.0-beta3) API.
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
reviewed by: <delete if not using a buddy>
* configure.ac:
* ext/xvid/gstxvid.c: (gst_xvid_init), (gst_xvid_error),
(gst_xvid_structure_to_csp), (gst_xvid_csp_to_caps):
* ext/xvid/gstxvid.h:
* ext/xvid/gstxviddec.c: (gst_xviddec_class_init),
(gst_xviddec_init), (gst_xviddec_setup), (gst_xviddec_chain),
(gst_xviddec_src_link), (gst_xviddec_sink_link),
(gst_xviddec_change_state):
* ext/xvid/gstxviddec.h:
* ext/xvid/gstxvidenc.c: (gst_xvidenc_profile_get_type),
(gst_xvidenc_base_init), (gst_xvidenc_class_init),
(gst_xvidenc_init), (gst_xvidenc_setup), (gst_xvidenc_chain),
(gst_xvidenc_link), (gst_xvidenc_set_property),
(gst_xvidenc_get_property), (gst_xvidenc_change_state):
* ext/xvid/gstxvidenc.h:
Update xvid plugin to latest xvid (1.0.0-beta3) API.
Ronald S. Bultje [Sat, 3 Jan 2004 13:20:57 +0000 (13:20 +0000)]
gst/rtp/rtp-packet.c: Add sys/types.h include, since OS X doesn't define in_addr_t in netinet/in.h, like it does on L...
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/rtp/rtp-packet.c:
Add sys/types.h include, since OS X doesn't define in_addr_t
in netinet/in.h, like it does on Linux (see #129600).
Ronald S. Bultje [Sat, 3 Jan 2004 13:14:20 +0000 (13:14 +0000)]
Oops, failed to add this file during previous OS X stuff commit
Original commit message from CVS:
Oops, failed to add this file during previous OS X stuff commit
Ronald S. Bultje [Sat, 3 Jan 2004 13:09:21 +0000 (13:09 +0000)]
ext/alsa/gstalsamixer.c: Correct logic of dispose function (see #129306).
Original commit message from CVS:
2004-01-03 Thomas Canty <tommydal@optushome.com.au>
reviewed by: Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_dispose):
Correct logic of dispose function (see #129306).
Ronald S. Bultje [Sat, 3 Jan 2004 13:06:10 +0000 (13:06 +0000)]
gst/mpegstream/: and also fix integer overflows at high PTS values (see #126967).
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_pes):
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_class_init),
(gst_mpeg_parse_init):
* gst/mpegstream/gstmpegparse.h:
Remove clock (which was never provided, i.e. dead code), and
also fix integer overflows at high PTS values (see #126967).
Ronald S. Bultje [Sat, 3 Jan 2004 12:53:44 +0000 (12:53 +0000)]
ext/: OS X fixes (see #126628).
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/flac/gstflacdec.c:
* ext/libpng/gstpngenc.h:
* ext/mikmod/gstmikmod.h:
OS X fixes (see #126628).
David Schleef [Sat, 3 Jan 2004 11:18:56 +0000 (11:18 +0000)]
Change sink pad template caps to "video/quicktime"
Original commit message from CVS:
Change sink pad template caps to "video/quicktime"
David Schleef [Sat, 3 Jan 2004 01:27:31 +0000 (01:27 +0000)]
ext/alsa/gstalsasrc.c: Remove bogus "src" request pad.
Original commit message from CVS:
* ext/alsa/gstalsasrc.c: (gst_alsa_src_pad_factory),
(gst_alsa_src_base_init): Remove bogus "src" request pad.
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_base_init),
(gst_mpeg_parse_class_init): Move pad template registration
to class_init, since the derived class (mpegdemux) doesn't
want them.
Ronald S. Bultje [Fri, 2 Jan 2004 23:42:30 +0000 (23:42 +0000)]
sys/: Move interface libs from LDFLAGS to LIBADD, fix relocation errors after installation (see #127664).
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/ximage/Makefile.am:
* sys/xvideo/Makefile.am:
* sys/xvimage/Makefile.am:
Move interface libs from LDFLAGS to LIBADD, fix relocation errors
after installation (see #127664).
David Schleef [Fri, 2 Jan 2004 23:11:41 +0000 (23:11 +0000)]
ext/ffmpeg/gstffmpegenc.c: Negotiation fixes.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init),
(gst_ffmpegenc_connect): Negotiation fixes.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
Remove inappropriate gst_caps_free().
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Reenable Ronald's internal resize code, since the core handles
it correctly now.
Ronald S. Bultje [Fri, 2 Jan 2004 21:57:10 +0000 (21:57 +0000)]
sys/v4l/: Fix pad template stuff.
Original commit message from CVS:
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init):
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init), (gst_v4lsrc_init):
Fix pad template stuff.
Ronald S. Bultje [Fri, 2 Jan 2004 20:38:59 +0000 (20:38 +0000)]
gst/matroska/: fix signed integer reading/writing.
Original commit message from CVS:
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/matroska/ebml-read.c: (gst_ebml_read_sint):
* gst/matroska/ebml-write.c: (gst_ebml_write_sint):
fix signed integer reading/writing.
Benjamin Otte [Fri, 2 Jan 2004 17:28:56 +0000 (17:28 +0000)]
ext/alsa/README: Remove outdated document
Original commit message from CVS:
2004-01-02 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/alsa/README:
Remove outdated document
Jan Schmidt [Fri, 2 Jan 2004 15:32:40 +0000 (15:32 +0000)]
src pad was being created twice - oops.
Original commit message from CVS:
src pad was being created twice - oops.
Ronald S. Bultje [Fri, 2 Jan 2004 11:34:24 +0000 (11:34 +0000)]
sys/ximage/ximagesink.c: Comment out internal resize. It doesn't handle the resulting
Original commit message from CVS:
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Comment out internal resize. It doesn't handle the resulting
XEvent internally, does another try_set_caps() which leads to
a really nice loop.
Real fix will come when Julien and Dave are awake. ;).
Ronald S. Bultje [Fri, 2 Jan 2004 10:51:57 +0000 (10:51 +0000)]
ext/mpeg2enc/gstmpeg2enc.cc: fix const/nonconst compile issue.
Original commit message from CVS:
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/mpeg2enc/gstmpeg2enc.cc:
fix const/nonconst compile issue.
David Schleef [Fri, 2 Jan 2004 10:04:34 +0000 (10:04 +0000)]
Add fixate function and test for bad caps
Original commit message from CVS:
Add fixate function and test for bad caps
David Schleef [Fri, 2 Jan 2004 08:12:12 +0000 (08:12 +0000)]
Fix some regressions caused by caps conversion
Original commit message from CVS:
Fix some regressions caused by caps conversion
David Schleef [Fri, 2 Jan 2004 07:25:10 +0000 (07:25 +0000)]
Negotiation fixes
Original commit message from CVS:
Negotiation fixes
David Schleef [Fri, 2 Jan 2004 07:09:23 +0000 (07:09 +0000)]
Convert elements to use gst_pad_use_explicit_caps() where appropriate.
Original commit message from CVS:
Convert elements to use gst_pad_use_explicit_caps() where appropriate.
Ronald S. Bultje [Thu, 1 Jan 2004 22:45:57 +0000 (22:45 +0000)]
configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1....
Original commit message from CVS:
2004-01-01 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
Fix configure check for mpeg2enc. We need 1.6.1.93 instead of
1.6.1.92, since the pkg-config file of 1.6.1.92 is borked and
it therefore uses the wrong include paths. Too bad... Note
that 1.6.1.93 is not release yet. ;).
Also add a check for mplex, which is now using the lib'ified
mplex from mjpegtools, too.
* ext/ffmpeg/gstffmpegcodecmap.c:
Add codec_tag for 3ivx/xvid. For xvid, this should fix playback
issues. I don't think ffmpeg handles 3ivx correctly, so this
probably won't work. But it won't hurt either.
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect),
(gst_ffmpegdec_chain):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect),
(gst_ffmpegenc_chain_audio):
Fix memleak in audio encoding. Close codec if open fails, this
calls the cleanup routines so we can re-use the context.
* ext/mpeg2enc/gstmpeg2enc.cc:
Fix pad template names/types, fix memory issue with getcaps().
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encoder.hh:
Fix compile issue with new caps system (const thingy).
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.hh:
We read a first frame right on initing, so that we have a caps
when we init the output. This caps is cached in padprivate and
read as first frame.
* ext/mplex/Makefile.am:
* ext/mplex/gstmplex.cc:
* ext/mplex/gstmplex.h:
* ext/mplex/gstmplex.hh:
* ext/mplex/gstmplexibitstream.cc:
* ext/mplex/gstmplexibitstream.hh:
* ext/mplex/gstmplexjob.cc:
* ext/mplex/gstmplexjob.hh:
* ext/mplex/gstmplexoutputstream.cc:
* ext/mplex/gstmplexoutputstream.hh:
We wrap mjpegtools mplex. So I rewrote the plugin. The old plugin
had issues, didn't do capsnego, supported only a subset of the
mplex features and required a mplex fork in our local CVS. Plus
that it worked agaist a very old mplex version. Rewriting was
faster than updating it.
* gst-libs/ext/Makefile.am:
* gst-libs/ext/mplex/INSTRUCT:
* gst-libs/ext/mplex/Makefile.am:
* gst-libs/ext/mplex/README:
* gst-libs/ext/mplex/TODO:
* gst-libs/ext/mplex/ac3strm_in.cc:
* gst-libs/ext/mplex/audiostrm.hh:
* gst-libs/ext/mplex/audiostrm_out.cc:
* gst-libs/ext/mplex/aunit.hh:
* gst-libs/ext/mplex/bits.cc:
* gst-libs/ext/mplex/bits.hh:
* gst-libs/ext/mplex/buffer.cc:
* gst-libs/ext/mplex/buffer.hh:
* gst-libs/ext/mplex/fastintfns.h:
* gst-libs/ext/mplex/format_codes.h:
* gst-libs/ext/mplex/inputstrm.cc:
* gst-libs/ext/mplex/inputstrm.hh:
* gst-libs/ext/mplex/lpcmstrm_in.cc:
* gst-libs/ext/mplex/mjpeg_logging.cc:
* gst-libs/ext/mplex/mjpeg_logging.h:
* gst-libs/ext/mplex/mjpeg_types.h:
* gst-libs/ext/mplex/mpastrm_in.cc:
* gst-libs/ext/mplex/mpegconsts.cc:
* gst-libs/ext/mplex/mpegconsts.h:
* gst-libs/ext/mplex/mplexconsts.hh:
* gst-libs/ext/mplex/multplex.cc:
* gst-libs/ext/mplex/outputstream.hh:
* gst-libs/ext/mplex/padstrm.cc:
* gst-libs/ext/mplex/padstrm.hh:
* gst-libs/ext/mplex/stillsstream.cc:
* gst-libs/ext/mplex/stillsstream.hh:
* gst-libs/ext/mplex/systems.cc:
* gst-libs/ext/mplex/systems.hh:
* gst-libs/ext/mplex/vector.cc:
* gst-libs/ext/mplex/vector.hh:
* gst-libs/ext/mplex/videostrm.hh:
* gst-libs/ext/mplex/videostrm_in.cc:
* gst-libs/ext/mplex/videostrm_out.cc:
* gst-libs/ext/mplex/yuv4mpeg.cc:
* gst-libs/ext/mplex/yuv4mpeg.h:
* gst-libs/ext/mplex/yuv4mpeg_intern.h:
* gst-libs/ext/mplex/yuv4mpeg_ratio.cc:
We don't fork mjpegtools' mplex in our CVS anymore.
* gst/avi/gstavidemux.c: (gst_avi_demux_src_getcaps),
(gst_avi_demux_add_stream):
* gst/avi/gstavidemux.h:
Add getcaps() function for proper caps nego. This makes some
parts of AVI playback/reading work.
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Resize window on new capsnego. This is probably wrong, but
I'm still committing it because with current capsnego, the
first successfull capsnego is auto-fixated, therefore rounded
down to the lowest values in the caps. this results in a 16x16
XWindow that is not reized when real capsnego finishes.
Dave, I see more cases of this, do you know a proper solution?
* tools/gst-launch-ext.in:
Fix MPEG-4 AAC (Apple iPod/iTunes) file commandline.
David Schleef [Wed, 31 Dec 2003 08:41:48 +0000 (08:41 +0000)]
Change gst_pad_proxy_link() to gst_pad_try_set_caps()
Original commit message from CVS:
Change gst_pad_proxy_link() to gst_pad_try_set_caps()
David Schleef [Wed, 31 Dec 2003 08:02:04 +0000 (08:02 +0000)]
Negotiation fixes.
Original commit message from CVS:
Negotiation fixes.
Colin Walters [Tue, 30 Dec 2003 02:07:05 +0000 (02:07 +0000)]
ext/esd/esdsink.c (gst_esdsink_link): Fix typo; get depth instead of signed.
Original commit message from CVS:
2003-12-29 Colin Walters <walters@verbum.org>
* ext/esd/esdsink.c (gst_esdsink_link): Fix typo; get depth instead of
signed.
Jan Schmidt [Mon, 29 Dec 2003 15:16:03 +0000 (15:16 +0000)]
Fix warning about discarding const qualifier
Original commit message from CVS:
Fix warning about discarding const qualifier
Jeremy Simon [Sat, 27 Dec 2003 19:49:18 +0000 (19:49 +0000)]
Changelog update
Original commit message from CVS:
Changelog update
Jeremy Simon [Sat, 27 Dec 2003 19:37:16 +0000 (19:37 +0000)]
Fix warnings
Original commit message from CVS:
Fix warnings
Benjamin Otte [Sat, 27 Dec 2003 17:19:29 +0000 (17:19 +0000)]
ext/alsa/gstalsa.c: Don't send ALSA debugging to stderr.
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/alsa/gstalsa.c: (gst_alsa_open_audio):
Don't send ALSA debugging to stderr.
* ext/alsa/gstalsa.h:
Use GST_WARNING instead of g_warning when ALSA functions fail.
Benjamin Otte [Sat, 27 Dec 2003 15:37:43 +0000 (15:37 +0000)]
sys/xvimage/xvimagesink.c: Free XVAdapterInfo correctly.
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support):
Free XVAdapterInfo correctly.
Benjamin Otte [Sat, 27 Dec 2003 13:54:14 +0000 (13:54 +0000)]
ext/mad/gstid3tag.c: Make id3tag use correct caps nego.
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/mad/gstid3tag.c: (gst_id3_tag_add_src_pad),
(gst_id3_tag_do_caps_nego), (gst_id3_tag_src_link):
Make id3tag use correct caps nego.
Amaury Jacquot [Sat, 27 Dec 2003 13:07:06 +0000 (13:07 +0000)]
make tremor work again
Original commit message from CVS:
make tremor work again
Benjamin Otte [Sat, 27 Dec 2003 10:11:02 +0000 (10:11 +0000)]
testsuite/spider/: Make tests compile again. They probably don't work.
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* testsuite/spider/spider1.c: (main):
* testsuite/spider/spider2.c: (main):
* testsuite/spider/spider3.c: (main):
Make tests compile again. They probably don't work.
Colin Walters [Wed, 24 Dec 2003 17:01:00 +0000 (17:01 +0000)]
Return NULL if we can't fixate the caps anymore.
Original commit message from CVS:
Return NULL if we can't fixate the caps anymore.
David Schleef [Wed, 24 Dec 2003 03:31:06 +0000 (03:31 +0000)]
gst/volume/gstvolume.c: Proxy getcaps.
Original commit message from CVS:
* gst/volume/gstvolume.c: (volume_init): Proxy getcaps.
* sys/oss/gstosssink.c: (gst_osssink_init),
(gst_osssink_sink_fixate): Add fixate function.
Ronald S. Bultje [Wed, 24 Dec 2003 00:12:16 +0000 (00:12 +0000)]
ext/ffmpeg/: fix typo in RGB masks, and move back to "old" colorspace capsnego code until whoever wrote this new crap...
Original commit message from CVS:
2003-12-24 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegcodecmap.c:
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps),
(gst_ffmpegcsp_srcconnect_func), (gst_ffmpegcsp_sinkconnect),
(gst_ffmpegcsp_srcconnect), (gst_ffmpegcsp_get_type),
(gst_ffmpegcsp_base_init), (gst_ffmpegcsp_class_init),
(gst_ffmpegcsp_init), (gst_ffmpegcsp_chain),
(gst_ffmpegcsp_change_state), (gst_ffmpegcsp_set_property),
(gst_ffmpegcsp_get_property), (gst_ffmpegcsp_register):
fix typo in RGB masks, and move back to "old" colorspace
capsnego code until whoever wrote this new crap has actually
tested it so that it works.
And yes, this works, keep it that way please.
Ronald S. Bultje [Tue, 23 Dec 2003 22:50:05 +0000 (22:50 +0000)]
Fix caps breakage after Dave's caps branch merge.
Original commit message from CVS:
2003-12-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/divx/gstdivxdec.c: (gst_divxdec_base_init),
(gst_divxdec_init), (gst_divxdec_negotiate):
* ext/divx/gstdivxdec.h:
* ext/divx/gstdivxenc.c: (gst_divxenc_base_init),
(gst_divxenc_init):
* ext/faac/gstfaac.c: (gst_faac_base_init), (gst_faac_init),
(gst_faac_sinkconnect), (gst_faac_srcconnect):
* ext/mpeg2enc/gstmpeg2enc.cc:
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_base_init),
(dxr3audiosink_init), (dxr3audiosink_pcm_sinklink):
* sys/dxr3/dxr3spusink.c: (dxr3spusink_base_init),
(dxr3spusink_init):
* sys/dxr3/dxr3videosink.c: (dxr3videosink_base_init),
(dxr3videosink_init):
Fix caps breakage after Dave's caps branch merge.
Ronald S. Bultje [Tue, 23 Dec 2003 22:41:37 +0000 (22:41 +0000)]
Fix 24bppLE RGB
Original commit message from CVS:
Fix 24bppLE RGB
Colin Walters [Tue, 23 Dec 2003 21:30:12 +0000 (21:30 +0000)]
I'm too lazy to comment this
Original commit message from CVS:
*** empty log message ***
Colin Walters [Tue, 23 Dec 2003 21:28:35 +0000 (21:28 +0000)]
Add ARG_HANDLE property that takes a GnomeVFSHandle directly.
Original commit message from CVS:
Add ARG_HANDLE property that takes a GnomeVFSHandle directly.
Benjamin Otte [Mon, 22 Dec 2003 21:06:03 +0000 (21:06 +0000)]
gst/volume/: Reenable volume element and fix to work with new caps stuff.
Original commit message from CVS:
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/volume/Makefile.am:
* gst/volume/gstvolume.c: (volume_connect), (volume_parse_caps),
(volume_base_init), (volume_init):
Reenable volume element and fix to work with new caps stuff.
Rhythmbox needs this.
Benjamin Otte [Mon, 22 Dec 2003 19:05:34 +0000 (19:05 +0000)]
gst/qtdemux/qtdemux.c: qtdemux requires bytestream
Original commit message from CVS:
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/qtdemux/qtdemux.c: (plugin_init):
qtdemux requires bytestream
Benjamin Otte [Mon, 22 Dec 2003 16:38:00 +0000 (16:38 +0000)]
ext/alsa/gstalsa.c: Fix remaining caps handling errors due to CAPS merge.
Original commit message from CVS:
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/alsa/gstalsa.c: (gst_alsa_get_caps), (gst_alsa_link):
Fix remaining caps handling errors due to CAPS merge.
Benjamin Otte [Mon, 22 Dec 2003 06:56:16 +0000 (06:56 +0000)]
ext/faad/gstfaad.c: Port to new caps system.
Original commit message from CVS:
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/faad/gstfaad.c: (gst_faad_base_init), (gst_faad_init),
(gst_faad_sinkconnect), (gst_faad_srcgetcaps),
(gst_faad_srcconnect):
Port to new caps system.
David Schleef [Mon, 22 Dec 2003 01:47:09 +0000 (01:47 +0000)]
Merge CAPS branch
Original commit message from CVS:
Merge CAPS branch
Julien Moutte [Sun, 21 Dec 2003 22:11:45 +0000 (22:11 +0000)]
examples/gstplay/player.c: using g_print instead of g_message.
Original commit message from CVS:
* examples/gstplay/player.c: (got_time_tick), (got_stream_length),
(got_video_size), (main): using g_print instead of g_message.
* gst-libs/gst/play/gstplay.c: (gst_play_pipeline_setup): Fixing EOS
signal which was not emitted because of "switch" element added to the
bin but not connected. (Removing from the bin temporarily)
Thomas Vander Stichele [Sun, 21 Dec 2003 20:51:14 +0000 (20:51 +0000)]
fix BBB's configure.ac changes
Original commit message from CVS:
fix BBB's configure.ac changes
Julien Moutte [Sun, 21 Dec 2003 19:48:40 +0000 (19:48 +0000)]
configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to find X development files. I don't understand the...
Original commit message from CVS:
* configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to
find X development files. I don't understand the previous tests and
they fail on my debian/ppc unstable. This one works.
* examples/gstplay/player.c: (main): Set the pipeline to READY before
exiting.
* gst-libs/gst/play/gstplay.c: (gst_play_get_length_callback),
(gst_play_set_video_sink), (gst_play_set_audio_sink),
(gst_play_set_visualization): Add some safety checks in set_ methods
and state_change. This was throwing some ugly CRITICAL messages when
pipeline was getting disposed and casts were failing.
Ronald S. Bultje [Sun, 21 Dec 2003 18:44:34 +0000 (18:44 +0000)]
configure.ac: Improve mpeg2enc detection. This is for distributions that do ship mjpegtools, but without mpeg2enc. Al...
Original commit message from CVS:
2003-12-21 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
Improve mpeg2enc detection. This is for distributions that do
ship mjpegtools, but without mpeg2enc. Also does object check
for might there ever be ABI incompatibility.
* ext/mpeg2enc/gstmpeg2enc.cc:
Add Andrew as second maintainer (he's helping me), and also add
an error if no caps was set. This happens if I pull before capsnego
and that's something I should solve sometime else.
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_blockgroup):
Fix time parsing.
* gst/matroska/matroska-mux.c: (gst_matroska_mux_audio_pad_link),
(gst_matroska_mux_track_header):
Add caps to templates.
* gst/mpegaudioparse/gstmpegaudioparse.c: (mp3_sink_factory):
Add mpegversion=1 to prevent confusion with MPEG/AAC.
* gst/mpegstream/gstmpegdemux.c:
Remove layer since it causes warnings about unfixed caps.
* gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_get):
Fix obvious typo (we error out if caps were set, we should of
course error out if *no* caps were set).
* sys/oss/gstosselement.c: (gst_osselement_convert):
Fix format conversion, we confused bits/bytes.
* sys/oss/gstosselement.h:
Improve documentation for 'bps'.
* sys/v4l/TODO:
Remove stuff about plugins that need removing - this was done
ages ago.
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init),
(gst_v4lmjpegsrc_src_convert), (gst_v4lmjpegsrc_src_query):
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_init), (gst_v4lsrc_src_convert),
(gst_v4lsrc_src_query):
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_init),
(gst_v4l2src_src_convert), (gst_v4l2src_src_query):
Add get_query_types(), get_formats() and query() functions.
Thomas Vander Stichele [Sun, 21 Dec 2003 18:06:07 +0000 (18:06 +0000)]
fresh ChangeLog
Original commit message from CVS:
fresh ChangeLog
Thomas Vander Stichele [Sat, 20 Dec 2003 13:58:35 +0000 (13:58 +0000)]
bump back to cvs versoin
Original commit message from CVS:
bump back to cvs versoin
Thomas Vander Stichele [Sat, 20 Dec 2003 13:53:55 +0000 (13:53 +0000)]
committing release stuff testing fdo cvs commits this mail should have the proper viewcvs links
Original commit message from CVS:
committing release stuff
testing fdo cvs commits
this mail should have the proper viewcvs links
Ronald S. Bultje [Fri, 19 Dec 2003 16:07:00 +0000 (16:07 +0000)]
Quickfix for wrong timestamps... No final solution yet
Original commit message from CVS:
Quickfix for wrong timestamps... No final solution yet
Thomas Vander Stichele [Fri, 19 Dec 2003 14:39:03 +0000 (14:39 +0000)]
superfluous space segregation
Original commit message from CVS:
superfluous space segregation
Christian Schaller [Thu, 18 Dec 2003 11:18:40 +0000 (11:18 +0000)]
add missing tah.h file
Original commit message from CVS:
add missing tah.h file
Ronald S. Bultje [Thu, 18 Dec 2003 09:31:49 +0000 (09:31 +0000)]
Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding...
Original commit message from CVS:
Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding. This should fix mp3 playback.
Christian Schaller [Wed, 17 Dec 2003 22:56:57 +0000 (22:56 +0000)]
small fix
Original commit message from CVS:
small fix
Ronald S. Bultje [Wed, 17 Dec 2003 22:36:20 +0000 (22:36 +0000)]
Go back to old code, it works good enough...
Original commit message from CVS:
Go back to old code, it works good enough...
Thomas Vander Stichele [Wed, 17 Dec 2003 10:26:10 +0000 (10:26 +0000)]
install fix
Original commit message from CVS:
install fix
Ronald S. Bultje [Tue, 16 Dec 2003 22:00:21 +0000 (22:00 +0000)]
Remove debugging statements
Original commit message from CVS:
Remove debugging statements
Ronald S. Bultje [Tue, 16 Dec 2003 21:47:40 +0000 (21:47 +0000)]
Fix some clocking issue in OSS. The issue is that if we seek forward (note: specifically forward-only), then we call ...
Original commit message from CVS:
Fix some clocking issue in OSS. The issue is that if we seek forward (note: specifically forward-only), then we call handle_discont() before re-setting the clock to active. However, gstclock.c tells us that handle_discont only succeeds if allow_discont=TRUE, which is set in... set_active(TRUE). So, we first need to re-activate the clock and *then* call handle_discont(). More importantly, though, we should **NEVER EVER EVER EVER EVER** **NEVER EVER EVER EVER EVER** call clock_wait() after a forward discont without first having called handle_discont(). I don't know who added that code, but it's beyond fundamentally broken. clock_wait() **WAITS** until we're at the new given buftime, so if we do that on a forward-seek buffer, we... yes! we wait the amount of time that we seeked forward. Anyway, Apparently this code has been in here for quite a long time so I don't get how this can ever have worked...
Ronald S. Bultje [Tue, 16 Dec 2003 21:30:41 +0000 (21:30 +0000)]
Er, right, this is a typo
Original commit message from CVS:
Er, right, this is a typo
Thomas Vander Stichele [Tue, 16 Dec 2003 16:58:59 +0000 (16:58 +0000)]
disable gdk_pixbuf by default
Original commit message from CVS:
disable gdk_pixbuf by default
Julien Moutte [Tue, 16 Dec 2003 14:56:06 +0000 (14:56 +0000)]
Adding tag dumping support.
Original commit message from CVS:
Adding tag dumping support.
Benjamin Otte [Tue, 16 Dec 2003 03:37:21 +0000 (03:37 +0000)]
live and let die
Original commit message from CVS:
live and let die
Zeeshan Ali [Mon, 15 Dec 2003 22:27:28 +0000 (22:27 +0000)]
First attempt to code cacasink. Dont expect anything at all yet.
Original commit message from CVS:
First attempt to code cacasink. Dont expect anything at all yet.
Benjamin Otte [Mon, 15 Dec 2003 02:34:56 +0000 (02:34 +0000)]
who needs mod playback in spider...
Original commit message from CVS:
who needs mod playback in spider...
Thomas Vander Stichele [Sun, 14 Dec 2003 23:28:34 +0000 (23:28 +0000)]
make sdl depend on X
Original commit message from CVS:
make sdl depend on X
Ronald S. Bultje [Sun, 14 Dec 2003 22:48:18 +0000 (22:48 +0000)]
it's broken and it failed to load during the last few months. If anyone wants to revive it, have fun finding it back ...
Original commit message from CVS:
Remove ossgst... It's a crude hack (beyond ugly), it's broken and it failed to load during the last few months. If anyone wants to revive it, have fun finding it back in the CVS history
Thomas Vander Stichele [Sun, 14 Dec 2003 19:09:23 +0000 (19:09 +0000)]
distcheck fixes
Original commit message from CVS:
distcheck fixes
Thomas Vander Stichele [Sun, 14 Dec 2003 18:07:35 +0000 (18:07 +0000)]
build fix
Original commit message from CVS:
build fix