diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 14:13:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 14:13:57 +0000 |
| commit | f31065f6e5a157ce189382ba4ee940ceaf2da64c (patch) | |
| tree | fd7e4a4fd831c58d1455f193fc78b534608662a5 | |
| parent | a9d21e7830d88d960f9ffabdf32c4627ce3e14ee (diff) | |
| download | ffmpeg-f31065f6e5a157ce189382ba4ee940ceaf2da64c.tar.gz | |
add codec id and tag for JPEG 2000
Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 66a09ca1c2..99d34a6a28 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -119,6 +119,7 @@ enum CodecID { CODEC_ID_KMVC, CODEC_ID_FLASHSV, CODEC_ID_CAVS, + CODEC_ID_JPEG2000, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavformat/riff.c b/libavformat/riff.c index 0be0be7620..b496787fec 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, + { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, { CODEC_ID_RAWVIDEO, 0 }, { CODEC_ID_NONE, 0 }, }; |