summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
commit8e593f5a34b4827d6ec97dd875c802267a6f03b7 (patch)
tree648fde930e4a2b836a9803b17944c370a9608c72 /etc
parentbf31241e932818df3bc2eba55cf06c2b9ee3f56f (diff)
parent5c10618fa191d306e6d6674dd2fc7ad46476f85d (diff)
downloadmpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.bz2
mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.xz
Merge svn changes up to r30529
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index fffb1e0c2f..df379171da 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1674,6 +1674,14 @@ videocodec indeo3xa
dll "vid_iv32.xa"
out YVU9
+videocodec ffindeo5
+ info "FFmpeg Indeo 5"
+ status working
+ fourcc IV50
+ driver ffmpeg
+ dll indeo5
+ out YVU9
+
; DV: qdv is more stable... libdv is slow, mcdv is unstable
videocodec ffdv