[SCM] libav/experimental: Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf, avi and wav containers.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7bb8d51c1f17823f27e680b70dd18246bf6731ee
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date:   Sat Feb 23 23:30:41 2008 +0000

    Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.
    
    Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8870fde..e1128e5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -276,6 +276,8 @@ enum CodecID {
     CODEC_ID_NELLYMOSER,
     CODEC_ID_MUSEPACK8,
     CODEC_ID_SPEEX,
+    CODEC_ID_WMAVOICE,
+    CODEC_ID_WMAPRO,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7e87e19..d37fffd 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -177,6 +177,7 @@ const AVCodecTag codec_bmp_tags[] = {
 };
 
 const AVCodecTag codec_wav_tags[] = {
+    { CODEC_ID_WMAVOICE, 0xA },
     { CODEC_ID_MP2, 0x50 },
     { CODEC_ID_MP3, 0x55 },
     { CODEC_ID_AC3, 0x2000 },
@@ -195,6 +196,7 @@ const AVCodecTag codec_wav_tags[] = {
     { CODEC_ID_ADPCM_IMA_DK3, 0x62 },  /* rogue format number */
     { CODEC_ID_WMAV1, 0x160 },
     { CODEC_ID_WMAV2, 0x161 },
+    { CODEC_ID_WMAPRO, 0x162 },
     { CODEC_ID_AAC, 0x706d },
     { CODEC_ID_AAC, 0xff },
     { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?

-- 
Libav/FFmpeg packaging