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/xine-engine | |
| 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/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 42302b30f..3b25c732e 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -232,7 +232,8 @@ extern "C" { #define BUF_AUDIO_14_4 0x03230000 #define BUF_AUDIO_28_8 0x03240000 #define BUF_AUDIO_SIPRO 0x03250000 -#define BUF_AUDIO_WMAV3 0x03260000 +#define BUF_AUDIO_WMAPRO 0x03260000 +#define BUF_AUDIO_WMAV3 BUF_AUDIO_WMAPRO #define BUF_AUDIO_INTERPLAY 0x03270000 #define BUF_AUDIO_XA_ADPCM 0x03280000 #define BUF_AUDIO_WESTWOOD 0x03290000 diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 51e688f7e..33a09b907 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -859,8 +859,8 @@ static const audio_db_t audio_db[] = { { 0x162, 0 }, - BUF_AUDIO_WMAV3, - "Windows Media Audio v3" + BUF_AUDIO_WMAPRO, + "Windows Media Audio Professional" }, { { |