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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 75de5e405..d41b0442c 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,7 @@ for ucname in $ffmpeg_uncommon_codecs; do done dnl popular ffmpeg codecs -ffmpeg_popular_codecs="CINEPAK FLASHSV H261 H263 H263I H264 INDEO2 INDEO3 MJPEG MJPEGB MPEG1VIDEO MPEG2VIDEO MPEG4 MPEGVIDEO MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MSRLE MSVIDEO1 QTRLE RV10 RV20 SVQ1 SVQ3 VC1 VP3 VP5 VP6 VP6F WMV1 WMV2 WMV3 COOK DTS FLAC MP2 MP3 QDM2 RA_144 RA_288 WAVPACK WMAV1 WMAV2 ADPCM_SWF" +ffmpeg_popular_codecs="CINEPAK FLASHSV H261 H263 H263I H264 INDEO2 INDEO3 MJPEG MJPEGB MPEG1VIDEO MPEG2VIDEO MPEG4 MPEGVIDEO MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MSRLE MSVIDEO1 QTRLE RV10 RV20 SVQ1 SVQ3 VC1 VP3 VP5 VP6 VP6F WMV1 WMV2 WMV3 COOK DTS FLAC MP2 MP3 QDM2 RA_144 RA_288 WAVPACK WMAV1 WMAV2 WMAPRO ADPCM_SWF" for ucname in $ffmpeg_popular_codecs; do config_name="CONFIG_${ucname}_DECODER" @@ -3007,7 +3007,7 @@ if test "x$with_external_ffmpeg" = "xyes"; then else echo " - ffmpeg (internal library):" fi -echo " - Windows Media Audio v1/v2" +echo " - Windows Media Audio v1/v2/Pro" echo " - DV - logarithmic PCM" echo " - 14k4 - 28k8" echo " - MS ADPCM - IMA ADPCM" |