Commit e8d5a49a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Support for Windows Media Voice natively

May Ronald S. Bultje be praised for this.
parent d9666c8a
...@@ -29,6 +29,7 @@ Decoders: ...@@ -29,6 +29,7 @@ Decoders:
* Support for VAAPI for H.264 decoding on GPU on GNU/Linux * Support for VAAPI for H.264 decoding on GPU on GNU/Linux
* Audio/Video decoder using OpenMAX IL components * Audio/Video decoder using OpenMAX IL components
* Support for Indeo5 video codec * Support for Indeo5 video codec
* Support for Windows Media Speech (Voice) audio codec natively on all platforms
Demuxers: Demuxers:
* Support for ADPCM in .flv streams * Support for ADPCM in .flv streams
......
...@@ -271,6 +271,9 @@ static const struct ...@@ -271,6 +271,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 ) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
{ VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES }, { VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES },
#endif #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 }, { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },
......
...@@ -803,7 +803,7 @@ static const entry_t p_list_audio[] = { ...@@ -803,7 +803,7 @@ static const entry_t p_list_audio[] = {
A("wmal"), A("wmal"),
/* Windows Media Audio Speech */ /* 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"),
A("wmas"), A("wmas"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment