diff options
| author | Mike Melanson <mike@multimedia.cx> | 2008-12-11 07:49:05 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2008-12-11 07:49:05 +0000 |
| commit | 65fec2d98fa4cfd951b191cb4d03ab0ab676aed4 (patch) | |
| tree | 6aa0584de2d0ebb816f1fcb23ed982612db4388e /libavformat/riff.c | |
| parent | 09f6fc6b74de31a69b8da5ceaed20cfc5162e7fe (diff) | |
add 'ACDV' FourCC (which is just complete JPEG files in individual AVI
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)
Originally committed as revision 16052 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index cb3354f3a1..d394e1706f 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -111,6 +111,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, + { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, @@ -182,6 +183,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, { CODEC_ID_CLJR, MKTAG('c', 'l', 'j', 'r') }, { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, + { CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') }, { CODEC_ID_NONE, 0 } }; |