From f31065f6e5a157ce189382ba4ee940ceaf2da64c Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 24 Aug 2006 14:13:57 +0000 Subject: [PATCH] add codec id and tag for JPEG 2000 Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 1 + libavformat/riff.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 66a09ca..99d34a6 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 0be0be7..b496787 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 }, }; -- 2.7.4