summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-07-27 11:37:56 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-07-27 11:37:56 +0000
commit8950f82879fd41a64ee1faf9010e4ef997be3fc5 (patch)
treeede33adbabc4c5e237bcd8e40cfa52dbe45f0fa8
parent41415d28560fa450eac44618f4d5f4b6251bf876 (diff)
detect voxware (closes issue39)
Originally committed as revision 9809 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavformat/riff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c90b2cdc44..7b47b98fe9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -258,6 +258,7 @@ enum CodecID {
CODEC_ID_MLP,
CODEC_ID_GSM_MS, /* as found in WAV */
CODEC_ID_ATRAC3,
+ CODEC_ID_VOXWARE,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,
diff --git a/libavformat/riff.c b/libavformat/riff.c
index f2c7c112a5..0cb9e32419 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -206,6 +206,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_IMC, 0x401 },
{ CODEC_ID_GSM_MS, 0x31 },
{ CODEC_ID_ATRAC3, 0x270 },
+ { CODEC_ID_VOXWARE, 0x75 },
/* FIXME: All of the IDs below are not 16 bit and thus illegal. */
// for NuppelVideo (nuv.c)