add codec id and tag for JPEG 2000

Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 66a09ca1c2553fe4093a61488aa31a59640f9ccd..99d34a6a28dc185b69f66b0bec775c8691f6dfbc 100644 (file)
--- 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 0be0be76203af55778ad2755058da407457ec9c2..b496787fecbde315a37ae7166b80ce0494e27ce5 100644 (file)
--- 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 },
 };