summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-11 19:22:44 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-11 19:22:44 +0000
commit3f1640d8564b21ad56e9dea5663bdc4fdef8769f (patch)
tree90db84d3eee9f31cbd3585100045ed002007f48c /etc
parent91cc2bf92e933ab2046ab1eda59f8e2e45bb6526 (diff)
downloadmpv-3f1640d8564b21ad56e9dea5663bdc4fdef8769f.tar.bz2
mpv-3f1640d8564b21ad56e9dea5663bdc4fdef8769f.tar.xz
4xm with lavf+lavc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12173 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf10
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 43ceea3cbb..8ca2e811d3 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -375,6 +375,14 @@ videocodec ffsvq1
dll svq1
out YVU9
+videocodec ff4xm
+ info "FFmpeg 4XM video"
+ status working
+ fourcc 4XMV
+ driver ffmpeg
+ dll 4xm
+ out BGR16
+
videocodec ffdivx
info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
status working
@@ -450,7 +458,7 @@ videocodec ffodivx
fourcc M4S2,m4s2
fourcc xvid,XVID,XviD,XVIX
fourcc DX50,dx50,BLZ0 DX50
- fourcc mp4v
+ fourcc mp4v,MP4V
format 0x4
fourcc UMP4
fourcc 3IV2,3iv2 ; 3ivx Delta 4