diff options
author | Mike Melanson <mike@multimedia.cx> | 2003-10-01 04:39:38 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2003-10-01 04:39:38 +0000 |
commit | 2fdf638b0c66c22357d56f7cb205dd241b4a8c58 (patch) | |
tree | cdf625b0779d58f7a4c439ac61d6ba193911a81d /libavformat/avienc.c | |
parent | f2f6134b9e5abb0890867d47ba8c0e293d0ba2fe (diff) | |
download | ffmpeg-2fdf638b0c66c22357d56f7cb205dd241b4a8c58.tar.gz |
New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
Video-1, Apple RPZA, Cinepak, Westwood IMA ADPCM
Originally committed as revision 2324 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
-rw-r--r-- | libavformat/avienc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index ba2785f6bc..670dc2101c 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -141,6 +141,15 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, + { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, + { CODEC_ID_MSRLE, MKTAG(0x1, 0x0, 0x0, 0x0) }, + { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, + { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, + { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, + { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, + { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, + { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, + { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, { 0, 0 }, }; |