From 74ab902dea669bb3d6d3769d8a96640ca538a535 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 10 Dec 2012 17:06:21 +0100 Subject: 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. --- audio/out/ao_oss.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'audio/out/ao_oss.c') 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 -- cgit v1.2.3