[vlc-devel] commit: Support for Windows Media Voice natively (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Feb 14 13:34:59 2010 +0100| [e8d5a49a2633d4a2944827f21774fa8ca1108112] | committer: Jean-Baptiste Kempf 

Support for Windows Media Voice natively

May Ronald S. Bultje be praised for this.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8d5a49a2633d4a2944827f21774fa8ca1108112
---

 NEWS                           |    1 +
 modules/codec/avcodec/fourcc.c |    3 +++
 src/misc/fourcc.c              |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 9776fb9..5b3698b 100644
--- 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 fbec459..08e0443 100644
--- 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 d196721..cf797e6 100644
--- 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"),