[FFmpeg-cvslog] riff/img2: Add JPEG 2000 codec IDs.

[Kamil Nowosad]

ffmpeg | branch: release/0.7 | Kamil Nowosad <k.nowosad at students.mimuw.edu.pl> | Mon May 23 23:13:34 2011 +0200| [9ac3e32b29ae9e4af30ed671e736d1d83b0c7255] | committer: Reinhard Tartler

riff/img2: Add JPEG 2000 codec IDs.
(cherry picked from commit a304a833621a793bbf49b796fe1fd11ea1cd54c8)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac3e32b29ae9e4af30ed671e736d1d83b0c7255
---

 libavformat/img2.c |    1 +
 libavformat/riff.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/img2.c b/libavformat/img2.c
index ec37a38..4eef623 100644
--- 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}
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b2e8414..817349c 100644
--- 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', ' ') },