diff options
| author | Christopher Martin <christopher.martin@utoronto.ca> | 2010-02-21 09:43:00 -0500 |
|---|---|---|
| committer | Christopher Martin <christopher.martin@utoronto.ca> | 2010-02-21 09:43:00 -0500 |
| commit | 4e697948c4646cf4a5a2fd06490db034b1ae076c (patch) | |
| tree | d9cbbfa374dd225d83a135ade6ab120e1e9e222f /src/libw32dll | |
| parent | bc733336301ce98879f894600143ddcebcb9fe55 (diff) | |
| download | xine-lib-4e697948c4646cf4a5a2fd06490db034b1ae076c.tar.gz xine-lib-4e697948c4646cf4a5a2fd06490db034b1ae076c.tar.bz2 | |
WMAPro support
Rename "wmav3" to "wmapro" in xine-lib's internals to line up xine-lib's
nomenclature with what everyone else calls it and knows it as.
[Tweaked by ds to avoid API change.]
Tell xine-lib that when it finds wmapro, look to ffmpeg.
ffmpeg's wmapro decoder is unique in that it puts out samples that
are floats, not 16-bit ints. These need to be converted.
This requires external ffmpeg.
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 32cd7db29..715b10ff4 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; @@ -1693,7 +1693,7 @@ static const decoder_info_t dec_info_video = { }; static 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, |