summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-29 12:43:54 +0000
committerattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-29 12:43:54 +0000
commita7a3cb61d7673eefae9325360dbd78063268e7c7 (patch)
treec8e2a12bdb8b2a0b0b07efdd42d42f70a242ee91 /libmpdemux
parent5a69fab2f06a4d89a17b7d99f7e268a2008a9339 (diff)
downloadmpv-a7a3cb61d7673eefae9325360dbd78063268e7c7.tar.bz2
mpv-a7a3cb61d7673eefae9325360dbd78063268e7c7.tar.xz
fix some 10ls in sample rate handlin
patch by Josef Zlomek <josef.zlomek@email.cz> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11879 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/ai_oss.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/ai_oss.c b/libmpdemux/ai_oss.c
index 2d650cf57b..ad0b61fcee 100644
--- a/libmpdemux/ai_oss.c
+++ b/libmpdemux/ai_oss.c
@@ -46,6 +46,7 @@ int ai_oss_set_channels(audio_in_t *ai)
ai->req_channels);
return -1;
}
+ ai->channels = ioctl_param;
}
else
{
@@ -58,8 +59,8 @@ int ai_oss_set_channels(audio_in_t *ai)
ai->req_channels == 2);
return -1;
}
+ ai->channels = ioctl_param ? 2 : 1;
}
- ai->channels = ai->req_channels;
return 0;
}
@@ -102,7 +103,7 @@ int ai_oss_init(audio_in_t *ai)
ai->req_samplerate);
return -1;
}
- ai->samplerate = ai->req_samplerate;
+ ai->samplerate = ioctl_param;
mp_msg(MSGT_TV, MSGL_V, "ioctl dsp trigger: %d\n",
ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETTRIGGER, &ioctl_param));