Merge svn r30174

Changelog

@@ -14,6 +14,7 @@ MPlayer (1.0)
     * h264 decoder (CoreAVC) on Windows only via binary DLL
     * Kega Game video codec (KGV1) via binary DLL
     * SoftLab-NSK Forward MPEG2 I-frames (SLIF) via binary DLL
+    * JPEG2000 support via OpenJPEG
 
     Demuxers:
     * support for TrueHD in BluRay streams in libmpdemux

etc/codecs.conf

@@ -1399,6 +1399,16 @@ videocodec imagepower
   dll "jp2avi.dll"
   out BGR32,BGR24,BGR15
 
+videocodec fflibopenjpeg
+  info "OpenJPEG MJPEG2000"
+  status working
+  fourcc MJ2C
+  fourcc MJP2
+  fourcc mjp2
+  driver ffmpeg
+  dll "libopenjpeg"
+  out RGB24,RGB32,BGR32,Y8,Y800
+
 videocodec m3jpeg2k
   info "Morgan MJPEG2000"
   status working

libmpdemux/demux_mf.c

@@ -83,6 +83,8 @@ static const struct {
 } type2format[] = {
   { "bmp",  mmioFOURCC('b', 'm', 'p', ' ') },
   { "dpx",  mmioFOURCC('d', 'p', 'x', ' ') },
+  { "j2k",  mmioFOURCC('M', 'J', '2', 'C') },
+  { "jp2",  mmioFOURCC('M', 'J', '2', 'C') },
   { "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
   { "jpg",  mmioFOURCC('I', 'J', 'P', 'G') },
   { "jls",  mmioFOURCC('I', 'J', 'P', 'G') },