summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sys/oss/gstosshelper.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cff07bd0..1d90d50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-08 Jan Schmidt <jan.schmidt@sun.com>
+
+ * sys/oss/gstosshelper.c:
+ Verify that the format returned after the ioctl is the one
+ we requested. It is valid for the ioctl to succeed while
+ substituting an alternate 'supported' sample format.
+
2007-12-07 Tim-Philipp Müller <tim at centricular dot net>
* sys/oss/gstossaudio.c: (plugin_init):
diff --git a/sys/oss/gstosshelper.c b/sys/oss/gstosshelper.c
index 38b36893..dea22ccf 100644
--- a/sys/oss/gstosshelper.c
+++ b/sys/oss/gstosshelper.c
@@ -352,7 +352,7 @@ gst_oss_helper_rate_check_rate (GstOssProbe * probe, int irate)
GST_LOG ("checking format %d, channels %d, rate %d",
format, n_channels, rate);
ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format);
- if (ret < 0)
+ if (ret < 0 || format != probe->format)
return -1;
ret = ioctl (probe->fd, SNDCTL_DSP_CHANNELS, &n_channels);
if (ret < 0)