From: Jai Menon <jmenon86@gmail.com>
Date: Fri, 25 Jun 2010 08:29:19 +0000 (+0530)
Subject: JPEG 2000 decoding support.
X-Git-Tag: 1.2.0-pre1~6067
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=df8768da3e17abb5fca0081c98b7e61d53735b32

JPEG 2000 decoding support.

Adds a JPEG 2000 fourcc and hooks it up to the libavcodec decoder.
Also add an alias to 'mjp2' which is used to pack JPEG 2000 in MOV
by Final Cut Pro etc.
---

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index e28c42bde2..b1f349e119 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -114,6 +114,7 @@
 #define VLC_CODEC_AMV       VLC_FOURCC('A','M','V',' ')
 #define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_VP8       VLC_FOURCC('V','P','8','0')
+#define VLC_CODEC_JPEG2000  VLC_FOURCC('J','P','2','K')
 
 
 /* Planar YUV 4:1:0 Y:V:U */
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 3dce02845d..e47828fbb9 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -261,6 +261,7 @@ static const struct
     { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES },
     { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES },
     { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES },
+    { VLC_CODEC_JPEG2000, CODEC_ID_JPEG2000, VIDEO_ES },
 
     /*
      *  Audio Codecs
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 80b8db3db6..4739ae257a 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -786,6 +786,9 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_PCX, "Personal Computer Exchange Image"),
         A("pcx "),
 
+    B(VLC_CODEC_JPEG2000, "JPEG 2000 Image"),
+        A("mjp2"),
+
     B(0, "")
 };
 static const entry_t p_list_audio[] = {