Browse Source

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
tags/v0.5
Benjamin Larsson 18 years ago
parent
commit
7bb8d51c1f
2 changed files with 4 additions and 0 deletions
  1. +2
    -0
      libavcodec/avcodec.h
  2. +2
    -0
      libavformat/riff.c

+ 2
- 0
libavcodec/avcodec.h View File

@@ -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,


+ 2
- 0
libavformat/riff.c View File

@@ -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?


Loading…
Cancel
Save