Commit 800b9c24 authored by Benjamin Larsson's avatar Benjamin Larsson

Add more riff IDs to support remuxing.

Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent da00a1bd
......@@ -176,6 +176,8 @@ enum CodecID {
CODEC_ID_VB,
CODEC_ID_PCX,
CODEC_ID_SUNRAST,
CODEC_ID_INDEO4,
CODEC_ID_INDEO5,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
......@@ -284,6 +286,7 @@ enum CodecID {
CODEC_ID_SPEEX,
CODEC_ID_WMAVOICE,
CODEC_ID_WMAPRO,
CODEC_ID_WMALOSSLESS,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,
......
......@@ -121,6 +121,8 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
{ CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },
{ CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
{ CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') },
......@@ -199,6 +201,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_WMAV1, 0x0160 },
{ CODEC_ID_WMAV2, 0x0161 },
{ CODEC_ID_WMAPRO, 0x0162 },
{ CODEC_ID_WMALOSSLESS, 0x0163 },
{ CODEC_ID_ADPCM_CT, 0x0200 },
{ CODEC_ID_ATRAC3, 0x0270 },
{ CODEC_ID_IMC, 0x0401 },
......
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