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/format.h | |
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/format.h')
-rw-r--r-- | audio/format.h | 5 |
1 files changed, 1 insertions, 4 deletions
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) |