riff/img2: Add JPEG 2000 codec IDs.

a304a833 · Kamil Nowosad · Diego Biurrun · 2ea1ca17 · a304a833 · a304a833
Commit a304a833 authored May 23, 2011 by Kamil Nowosad Committed by Diego Biurrun Jun 21, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

libavformat/img2.c libavformat/img2.c +1 -0

libavformat/riff.c libavformat/riff.c +1 -0

No files found.
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -82,6 +82,7 @@ static const IdStrMap img_tags[] = {
    { CODEC_ID_SUNRAST   , "im24"},
    { CODEC_ID_SUNRAST   , "sunras"},
    { CODEC_ID_JPEG2000  , "jp2"},
+    { CODEC_ID_JPEG2000  , "jpc"},
    { CODEC_ID_DPX       , "dpx"},
    { CODEC_ID_PICTOR    , "pic"},
    { CODEC_ID_NONE      , NULL}

--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -250,6 +250,7 @@ const AVCodecTag ff_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', 'p', '2') },
    { CODEC_ID_JPEG2000,     MKTAG('M', 'J', '2', 'C') },
    { CODEC_ID_VMNC,         MKTAG('V', 'M', 'n', 'c') },
    { CODEC_ID_TARGA,        MKTAG('t', 'g', 'a', ' ') },