Commit f31065f6 authored by Baptiste Coudurier's avatar Baptiste Coudurier

add codec id and tag for JPEG 2000

Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a9d21e78
...@@ -119,6 +119,7 @@ enum CodecID { ...@@ -119,6 +119,7 @@ enum CodecID {
CODEC_ID_KMVC, CODEC_ID_KMVC,
CODEC_ID_FLASHSV, CODEC_ID_FLASHSV,
CODEC_ID_CAVS, CODEC_ID_CAVS,
CODEC_ID_JPEG2000,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
......
...@@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = { ...@@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = {
{ CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
{ CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
{ CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
{ CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
{ CODEC_ID_RAWVIDEO, 0 }, { CODEC_ID_RAWVIDEO, 0 },
{ CODEC_ID_NONE, 0 }, { CODEC_ID_NONE, 0 },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment