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/combined/ffmpeg/ffmpeg_decoder.c | |
| 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/combined/ffmpeg/ffmpeg_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index 6d0bfa432..adf0dad78 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -228,6 +228,7 @@ void avcodec_register_all(void) REGISTER_DECODER(WAVPACK, wavpack); REGISTER_DECODER(WMAV1, wmav1); REGISTER_DECODER(WMAV2, wmav2); + REGISTER_DECODER(WMAPRO, wmapro); REGISTER_DECODER(WS_SND1, ws_snd1); /* pcm codecs */ |