From 74ab902dea669bb3d6d3769d8a96640ca538a535 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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/format.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'audio/format.h')

diff --git a/audio/format.h b/audio/format.h
index d54eedabd2..a8249954f0 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -57,12 +57,9 @@
 #define AF_FORMAT_48BIT		(5<<3)
 #define AF_FORMAT_BITS_MASK	(7<<3)
 
-// Special flags refering to non pcm data
-#define AF_FORMAT_MU_LAW	(1<<6)
-#define AF_FORMAT_A_LAW		(2<<6)
+// Special flags refering to non pcm data (note: 1<<6, 2<<6, 5<<6 unused)
 #define AF_FORMAT_MPEG2		(3<<6) // MPEG(2) audio
 #define AF_FORMAT_AC3		(4<<6) // Dolby Digital AC3
-#define AF_FORMAT_IMA_ADPCM	(5<<6)
 #define AF_FORMAT_IEC61937      (6<<6)
 #define AF_FORMAT_SPECIAL_MASK	(7<<6)
 
-- 
cgit v1.2.3