[vlc-devel] commit: WMAPRO is inside FFmpeg now (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep  3 22:43:43 2009 +0200| [fe81626290c55e241e33b9e31149082eb5a62951] | committer: Jean-Baptiste Kempf 

WMAPRO is inside FFmpeg now

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

 modules/codec/avcodec/audio.c  |    5 +++++
 modules/codec/avcodec/fourcc.c |    7 +++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 90c5e7e..ae640e3 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -195,6 +195,11 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
     case CODEC_ID_FLAC:
         p_sys->i_output_max = 8 * sizeof(int32_t) * 65535;
         break;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
+    case CODEC_ID_WMAPRO:
+        p_sys->i_output_max = 8 * sizeof(float) * 6144; /* (1 << 12) * 3/2 */
+        break;
+#endif
     default:
         p_sys->i_output_max = 0;
         break;
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 79f993d..263b89c 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -894,6 +894,13 @@ static const struct
     { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2,
       AUDIO_ES, "Windows Media Audio 2" },
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
+    { VLC_FOURCC('W','M','A','P'), CODEC_ID_WMAPRO,
+      AUDIO_ES, "Windows Media Audio Professional" },
+    { VLC_FOURCC('w','m','a','p'), CODEC_ID_WMAPRO,
+      AUDIO_ES, "Windows Media Audio Professional" },
+#endif
+
     /* DV Audio */
     { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
       AUDIO_ES, "DV Audio" },