diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-23 22:46:49 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-23 22:46:49 +0000 |
| commit | 45ce973f67de950ba14bd691b12c94cec9cd7e9f (patch) | |
| tree | d6854758190b9e9ad80771b12f6fcf12daf27d51 /src/libw32dll | |
| parent | 2241baa294539a33d8bc6137e633bb4c93c22b4e (diff) | |
| parent | 7d4c68e4ba6932bfd300a9dc12d7e11b9cfb555d (diff) | |
| download | xine-lib-45ce973f67de950ba14bd691b12c94cec9cd7e9f.tar.gz xine-lib-45ce973f67de950ba14bd691b12c94cec9cd7e9f.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/w32codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index bfbb590ac..231a0625c 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1086,11 +1086,11 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Windows Media Audio v2 (win32)"); return "divxa32.acm"; - case BUF_AUDIO_WMAV3: + case BUF_AUDIO_WMAPRO: this->driver_type = DRIVER_DMO; this->guid=&wma3_clsid; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, - "Windows Media Audio v3 (win32)"); + "Windows Media Audio Professional (win32)"); return "wma9dmod.dll"; case BUF_AUDIO_WMALL: this->driver_type = DRIVER_DMO; @@ -1668,7 +1668,7 @@ static const decoder_info_t dec_info_video = { }; static const uint32_t audio_types[] = { - BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_WMAV3, BUF_AUDIO_MSADPCM, + BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_WMAPRO, BUF_AUDIO_MSADPCM, BUF_AUDIO_MSIMAADPCM, BUF_AUDIO_MSGSM, BUF_AUDIO_IMC, BUF_AUDIO_LH, BUF_AUDIO_VOXWARE, BUF_AUDIO_ACELPNET, BUF_AUDIO_VIVOG723, BUF_AUDIO_WMAV, BUF_AUDIO_WMALL, |