summaryrefslogtreecommitdiff
path: root/src/xine-engine/buffer.h
diff options
context:
space:
mode:
authorChristopher Martin <christopher.martin@utoronto.ca>2010-02-21 09:43:00 -0500
committerChristopher Martin <christopher.martin@utoronto.ca>2010-02-21 09:43:00 -0500
commit4e697948c4646cf4a5a2fd06490db034b1ae076c (patch)
treed9cbbfa374dd225d83a135ade6ab120e1e9e222f /src/xine-engine/buffer.h
parentbc733336301ce98879f894600143ddcebcb9fe55 (diff)
downloadxine-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/buffer.h')
-rw-r--r--src/xine-engine/buffer.h3
1 files changed, 2 insertions, 1 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