diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-05-17 14:17:49 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-05-17 14:17:49 +0100 |
| commit | 50820920cd492cf76bf72c1f915217937f764c62 (patch) | |
| tree | 3157e4b973a912916191d29a6ca90e1d929f0251 /src/xine-engine | |
| parent | 597429a7d24b55dec3570598f9509e8aa635cf04 (diff) | |
| parent | c5159206dcea00766b7d567193e1c4fd13f12cf3 (diff) | |
| download | xine-lib-50820920cd492cf76bf72c1f915217937f764c62.tar.gz xine-lib-50820920cd492cf76bf72c1f915217937f764c62.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer_types.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 2f362fa21..dc8550ca1 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -838,6 +838,7 @@ static const audio_db_t audio_db[] = { 0x01, ME_FOURCC('r','a','w',' '), ME_FOURCC('s','o','w','t'), + ME_FOURCC('4','2','n','i'), 0 }, BUF_AUDIO_LPCM_LE, |