+2004-02-27 David Schleef <ds@schleef.org>
+
+ patches from jmmv@menta.net (Julio M. Merino Vidal)
+
+ * gst/interleave/deinterleave.c: (deinterleave_chain): Fix
+ GST_ELEMENT_ERROR call (bug #135634)
+ * gst/interleave/interleave.c: (interleave_buffered_loop),
+ (interleave_bytestream_loop): Don't use alloca() (bug #135640)
+ * sys/cdrom/gstcdplayer_ioctl_bsd.h: Fix ioctls on NetBSD (bug #135645)
+ * sys/oss/gstosssink.c: (gst_osssink_get_delay),
+ (gst_osssink_chain): Fix ioctls on NetBSD. (bug #135644)
+ * sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_sync_next_frame),
+ (gst_v4lmjpegsrc_set_capture), (gst_v4lmjpegsrc_set_capture_m),
+ (gst_v4lmjpegsrc_capture_init), (gst_v4lmjpegsrc_requeue_frame):
+ Fix GST_ELEMENT_ERROR call.
+ * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_palette): Fix
+ GST_ELEMENT_ERROR call.
+
2004-02-27 Benjamin Otte <otte@gnome.org>
* gst-libs/gst/audio/audio.h:
gst_osssink_get_delay (GstOssSink *osssink)
{
gint delay = 0;
+ gint ret;
if (GST_OSSELEMENT (osssink)->fd == -1)
return 0;
- if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETODELAY, &delay) < 0) {
+#ifdef SNDCTL_DSP_GETODELAY
+ ret = ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETODELAY, &delay);
+#else
+ ret = -1;
+#endif
+ if (ret < 0) {
audio_buf_info info;
if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
delay = 0;
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC);
+ ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC, 0);
gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE);
gst_pad_event_default (pad, event);
return;