From e8d5a49a2633d4a2944827f21774fa8ca1108112 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 14 Feb 2010 13:34:59 +0100 Subject: [PATCH] Support for Windows Media Voice natively May Ronald S. Bultje be praised for this. --- NEWS | 1 + modules/codec/avcodec/fourcc.c | 3 +++ src/misc/fourcc.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9776fb9b8e..5b3698b0da 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 fbec4592ea..08e0443841 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 d196721737..cf797e6201 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"), -- 2.39.2