diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2006-01-20 17:13:45 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:28:02 +0100 |
| commit | c82590d2b2877ec846c5313ea897420209b91ea7 (patch) | |
| tree | 1fff44f8e7912cd2f49051749a57299184f69ff4 /sound/core | |
| parent | [ALSA] Add the notes on PM to ens1370/ens1371 sections (diff) | |
| download | linux-dev-c82590d2b2877ec846c5313ea897420209b91ea7.tar.xz linux-dev-c82590d2b2877ec846c5313ea897420209b91ea7.zip | |
[ALSA] Fix mulaw -> linear conversion in OSS PCM emulation
Modules: ALSA<-OSS emulation
Fixed the missing mulaw -> linear conversion in OSS PCM emulation code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/oss/pcm_plugin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c index cec2774425ec..0e67dd280a5d 100644 --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c @@ -470,7 +470,8 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug, /* format change */ if (srcformat.format != dstformat.format) { tmpformat.format = dstformat.format; - if (tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) { + if (srcformat.format == SNDRV_PCM_FORMAT_MU_LAW || + tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) { err = snd_pcm_plugin_build_mulaw(plug, &srcformat, &tmpformat, &plugin); |