Support for Windows Media Voice natively

May Ronald S. Bultje be praised for this.

diff --git a/NEWS b/NEWS
index 9776fb9b8e111e57059c59b0f601ff63b223d57c..5b3698b0da6a50c64b56e3e7e2e148c2530a45dc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ Decoders:
  * Support for VAAPI for H.264 decoding on GPU on GNU/Linux
  * Audio/Video decoder using OpenMAX IL components
  * Support for Indeo5 video codec
+ * Support for Windows Media Speech (Voice) audio codec natively on all platforms
 
 Demuxers:
  * Support for ADPCM in .flv streams

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index fbec4592ea7ddfeeddbeaea5e70f2ded4a2e16e3..08e0443841850596dd0865f293b5f939330bd382 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -271,6 +271,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
     { VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES },
 #endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 54, 0 )
+    { VLC_CODEC_WMAS, CODEC_ID_WMAVOICE, AUDIO_ES },
+#endif
 
     { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },
 

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index d196721737f137e85620b2235772f527576870e1..cf797e6201252336348d0df95c0aeabf0aafb04f 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -803,7 +803,7 @@ static const entry_t p_list_audio[] = {
         A("wmal"),
 
     /* Windows Media Audio Speech */
-    B(VLC_CODEC_WMAS, "Windows Media Audio Speech"),
+    B(VLC_CODEC_WMAS, "Windows Media Audio Voice (Speech)"),
         A("WMAS"),
         A("wmas"),