Commit cb4a37d0 authored by banan's avatar banan

Riff ids for wmapro and wmavoice, this adds support for stream copy of these...

Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12182 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 74a3e956
...@@ -276,6 +276,8 @@ enum CodecID { ...@@ -276,6 +276,8 @@ enum CodecID {
CODEC_ID_NELLYMOSER, CODEC_ID_NELLYMOSER,
CODEC_ID_MUSEPACK8, CODEC_ID_MUSEPACK8,
CODEC_ID_SPEEX, CODEC_ID_SPEEX,
CODEC_ID_WMAVOICE,
CODEC_ID_WMAPRO,
/* subtitle codecs */ /* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000, CODEC_ID_DVD_SUBTITLE= 0x17000,
......
...@@ -177,6 +177,7 @@ const AVCodecTag codec_bmp_tags[] = { ...@@ -177,6 +177,7 @@ const AVCodecTag codec_bmp_tags[] = {
}; };
const AVCodecTag codec_wav_tags[] = { const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_WMAVOICE, 0xA },
{ CODEC_ID_MP2, 0x50 }, { CODEC_ID_MP2, 0x50 },
{ CODEC_ID_MP3, 0x55 }, { CODEC_ID_MP3, 0x55 },
{ CODEC_ID_AC3, 0x2000 }, { CODEC_ID_AC3, 0x2000 },
...@@ -195,6 +196,7 @@ const AVCodecTag codec_wav_tags[] = { ...@@ -195,6 +196,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */ { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
{ CODEC_ID_WMAV1, 0x160 }, { CODEC_ID_WMAV1, 0x160 },
{ CODEC_ID_WMAV2, 0x161 }, { CODEC_ID_WMAV2, 0x161 },
{ CODEC_ID_WMAPRO, 0x162 },
{ CODEC_ID_AAC, 0x706d }, { CODEC_ID_AAC, 0x706d },
{ CODEC_ID_AAC, 0xff }, { CODEC_ID_AAC, 0xff },
{ CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
......
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