diff options
| author | wm4 <wm4@nowhere> | 2012-12-10 17:06:21 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-11 00:37:54 +0100 |
| commit | 74ab902dea669bb3d6d3769d8a96640ca538a535 (patch) | |
| tree | 75442f79f59ce9f4c4948a90ba70c3a21f4ba776 /audio/out | |
| parent | 071d24e19de6c2c0278e80f21e10572a4d694ddf (diff) | |
| download | mpv-74ab902dea669bb3d6d3769d8a96640ca538a535.tar.bz2 mpv-74ab902dea669bb3d6d3769d8a96640ca538a535.tar.xz | |
audio: remove support for native alaw/mulaw/adpcm output
This is considered a worthless feature. Note that alaw/mulaw/adpcm input
is unaffected: such data is handed to libavcodec and "decoded" to linear
PCM.
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_alsa.c | 6 | ||||
| -rw-r--r-- | audio/out/ao_oss.c | 6 | ||||
| -rw-r--r-- | audio/out/ao_pulse.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_rsound.c | 6 |
4 files changed, 0 insertions, 20 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 9a29beec7a..8e23ddefd2 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -415,12 +415,6 @@ static int init(int rate_hz, int channels, int format, int flags) case AF_FORMAT_FLOAT_BE: alsa_format = SND_PCM_FORMAT_FLOAT_BE; break; - case AF_FORMAT_MU_LAW: - alsa_format = SND_PCM_FORMAT_MU_LAW; - break; - case AF_FORMAT_A_LAW: - alsa_format = SND_PCM_FORMAT_A_LAW; - break; default: alsa_format = SND_PCM_FORMAT_MPEG; //? default should be -1 diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index ff8f8a1840..fa8eccdeea 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -88,9 +88,6 @@ static int format2oss(int format) case AF_FORMAT_FLOAT_NE: return AFMT_FLOAT; #endif // SPECIALS - case AF_FORMAT_MU_LAW: return AFMT_MU_LAW; - case AF_FORMAT_A_LAW: return AFMT_A_LAW; - case AF_FORMAT_IMA_ADPCM: return AFMT_IMA_ADPCM; #ifdef AFMT_MPEG case AF_FORMAT_MPEG2: return AFMT_MPEG; #endif @@ -131,9 +128,6 @@ static int oss2format(int format) case AFMT_FLOAT: return AF_FORMAT_FLOAT_NE; #endif // SPECIALS - case AFMT_MU_LAW: return AF_FORMAT_MU_LAW; - case AFMT_A_LAW: return AF_FORMAT_A_LAW; - case AFMT_IMA_ADPCM: return AF_FORMAT_IMA_ADPCM; #ifdef AFMT_MPEG case AFMT_MPEG: return AF_FORMAT_MPEG2; #endif diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 7e561c9541..314ef778bd 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -140,8 +140,6 @@ static const struct format_map { {AF_FORMAT_FLOAT_LE, PA_SAMPLE_FLOAT32LE}, {AF_FORMAT_FLOAT_BE, PA_SAMPLE_FLOAT32BE}, {AF_FORMAT_U8, PA_SAMPLE_U8}, - {AF_FORMAT_MU_LAW, PA_SAMPLE_ULAW}, - {AF_FORMAT_A_LAW, PA_SAMPLE_ALAW}, {AF_FORMAT_UNKNOWN, 0} }; diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c index bf77b1e4c2..7722bf19d2 100644 --- a/audio/out/ao_rsound.c +++ b/audio/out/ao_rsound.c @@ -80,12 +80,6 @@ static int set_format(struct ao *ao) case AF_FORMAT_U32_BE: rsd_format = RSD_U32_BE; break; - case AF_FORMAT_A_LAW: - rsd_format = RSD_ALAW; - break; - case AF_FORMAT_MU_LAW: - rsd_format = RSD_MULAW; - break; default: rsd_format = RSD_S16_LE; ao->format = AF_FORMAT_S16_LE; |