summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:22:11 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:22:33 +0200
commitefe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (patch)
treeecab8035e64e2a01bbec67904bee88a601b75130 /etc
parentd157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec (diff)
parent2e557e3b28add84c060abfae0b7241897be073eb (diff)
downloadmpv-efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a.tar.bz2
mpv-efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a.tar.xz
Merge svn r30174
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf10
1 files changed, 10 insertions, 0 deletions
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