diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-12-08 16:47:33 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-12-08 16:47:33 +0000 |
| commit | fed0fc44d4a0868fb36008ced2a42475dd75e41b (patch) | |
| tree | bf1e748f311e034dc2596af194b7a479d64f81a6 | |
| parent | 915732f5b5902ee6bc592c4b1e1cfd45baf79ca5 (diff) | |
sys/oss/gstosshelper.c: Verify that the format returned after the ioctl is the one we requested. It is valid for the ...
Original commit message from CVS:
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sys/oss/gstosshelper.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -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) |