diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-08 01:00:10 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-08 01:00:10 +0100 |
| commit | 628c4cbd9d023e74a7c6805d7ec0f163f2c172d1 (patch) | |
| tree | b74ddd76dc7fb3080ea269c6d3776f84aca36837 /src/xine-engine | |
| parent | 3f255412a55880c7323debef2bff0fc2dd5ed554 (diff) | |
| parent | 964f55aef546a1f1574c9f6ec10b3410fe390c34 (diff) | |
| download | xine-lib-628c4cbd9d023e74a7c6805d7ec0f163f2c172d1.tar.gz xine-lib-628c4cbd9d023e74a7c6805d7ec0f163f2c172d1.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer_types.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index b0e01db31..15b5ff952 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -808,6 +808,14 @@ static const audio_db_t audio_db[] = { }, { { + ME_FOURCC('a', 'd', 'u', 0x55), + 0 + }, + BUF_AUDIO_MP3ADU, + "MPEG layer-3 adu" +}, +{ + { ME_FOURCC('t','w','o','s'), ME_FOURCC('i','n','2','4'), 0 |