summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:03:14 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:03:14 +0200
commit36e7a20e695b376287310d602b44d6719f82a021 (patch)
tree75070d702043e875c947fccaa2de7a419331de22 /etc
parent70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff)
parent93abb4f09229730c30e5bbdd6c54d4b981995eee (diff)
downloadmpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2
mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz
Merge svn changes up to r30550
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 df379171da..4a05f15190 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -67,6 +67,16 @@ videocodec ffzmbv
dll "zmbv"
out RGB24
+videocodec geov
+ info "GeoCodec"
+ comment "crashes without -nosound, hangs on exit"
+ status buggy
+ fourcc GEOV
+ fourcc GEOX
+ driver vfw
+ dll "GeoCodec.dll"
+ out BGR24 flip
+
videocodec zmbv
info "Zip Motion-Block Video"
status working