diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2008-09-26 10:59:42 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2008-09-26 10:59:42 +0000 |
| commit | faeedbbb062d536a2c70659bc30142948070ddd2 (patch) | |
| tree | 8009fa272fcd5c29e1d3de9ff115b6d420c190f6 | |
| parent | 5c8a1d19274267bc45374b49a844192f54b40a93 (diff) | |
| download | ffmpeg-faeedbbb062d536a2c70659bc30142948070ddd2.tar.gz | |
Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 76522c4cd7..c2f7687234 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -304,6 +304,7 @@ enum CodecID { CODEC_ID_WMALOSSLESS, CODEC_ID_ATRAC3P, CODEC_ID_EAC3, + CODEC_ID_SIPR, /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, diff --git a/libavformat/riff.c b/libavformat/riff.c index 98a805d3b2..e00c9e131d 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -189,6 +189,7 @@ const AVCodecTag codec_wav_tags[] = { { CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */ { CODEC_ID_VOXWARE, 0x0075 }, { CODEC_ID_AAC, 0x00ff }, + { CODEC_ID_SIPR, 0x0130 }, { CODEC_ID_WMAV1, 0x0160 }, { CODEC_ID_WMAV2, 0x0161 }, { CODEC_ID_WMAPRO, 0x0162 }, |