Commit df8768da authored by Jai Menon's avatar Jai Menon Committed by Jean-Baptiste Kempf

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.
parent 3eeacf09
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
#define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ') #define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ')
#define VLC_CODEC_INDEO5 VLC_FOURCC('I','V','5','0') #define VLC_CODEC_INDEO5 VLC_FOURCC('I','V','5','0')
#define VLC_CODEC_VP8 VLC_FOURCC('V','P','8','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 */ /* Planar YUV 4:1:0 Y:V:U */
......
...@@ -261,6 +261,7 @@ static const struct ...@@ -261,6 +261,7 @@ static const struct
{ VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES }, { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES },
{ VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES }, { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES },
{ VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES }, { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES },
{ VLC_CODEC_JPEG2000, CODEC_ID_JPEG2000, VIDEO_ES },
/* /*
* Audio Codecs * Audio Codecs
......
...@@ -786,6 +786,9 @@ static const entry_t p_list_video[] = { ...@@ -786,6 +786,9 @@ static const entry_t p_list_video[] = {
B(VLC_CODEC_PCX, "Personal Computer Exchange Image"), B(VLC_CODEC_PCX, "Personal Computer Exchange Image"),
A("pcx "), A("pcx "),
B(VLC_CODEC_JPEG2000, "JPEG 2000 Image"),
A("mjp2"),
B(0, "") B(0, "")
}; };
static const entry_t p_list_audio[] = { static const entry_t p_list_audio[] = {
......
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