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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 76522c4cd721dc54d5ce817bb45a5fb5d989ebb5..c2f768723476eabdc48b920667c1af50073b5ba8 100644 (file)
--- 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 98a805d3b270641f213da949b84323724c6d3fa4..e00c9e131d5b20f6c6142fc6f74a2de9dbb93596 100644 (file)
--- 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 },