diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | etc/codecs.conf | 10 | ||||
| -rw-r--r-- | libmpdemux/demux_mf.c | 2 |
3 files changed, 13 insertions, 0 deletions
@@ -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 diff --git a/etc/codecs.conf b/etc/codecs.conf index 0c082420c3..c0d88cc42c 100644 --- a/etc/codecs.conf +++ b/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 diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index 9320c544ff..fa9b8ae630 100644 --- a/libmpdemux/demux_mf.c +++ b/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') }, |