summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-26 00:29:00 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-26 00:29:00 +0000
commitce4aaedc2e1324bee6c1e75544025f6e211f0707 (patch)
tree05c93a765707bd6d39a8834de9b8445802b84284 /DOCS
parentda687bff8bda8f50d2372e93e28e3541c40be468 (diff)
downloadmpv-ce4aaedc2e1324bee6c1e75544025f6e211f0707.tar.bz2
mpv-ce4aaedc2e1324bee6c1e75544025f6e211f0707.tar.xz
odivx<->divx4 order changed, null video codec added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1391 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/codecs.conf40
1 files changed, 26 insertions, 14 deletions
diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index bd8d68818b..963510599d 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -82,6 +82,20 @@ videocodec divx
out YUY2 yuvhack
out BGR32,BGR24,BGR15
+
+videocodec odivx
+ info "OpenDivX (MPEG-4 v2)"
+ comment "with postprocessing"
+ status working
+ fourcc DIVX,divx
+ fourcc DIV1,div1 divx
+ fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+ fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
+ format 0x4
+ driver odivx
+ dll "opendivx decore"
+ out YV12
+
videocodec divx4
info "DivX4Linux (MPEG-4 v2,v3)"
comment "with postprocessing"
@@ -98,19 +112,6 @@ videocodec divx4
out YUY2
out UYVY
out BGR32,BGR24,BGR16,BGR15
-
-videocodec odivx
- info "OpenDivX (MPEG-4 v2)"
- comment "with postprocessing"
- status working
- fourcc DIVX,divx
- fourcc DIV1,div1 divx
- fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
- fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
- format 0x4
- driver odivx
- dll "opendivx decore"
- out YV12
; =============== FFMPEG MPEG CODECS =========================
@@ -128,7 +129,7 @@ videocodec ffdivx
videocodec ffodivx
info "FFmpeg OpenDivX"
status working
- comment "doesn't support >= 4.0alpha48 movies yet"
+; comment "doesn't support >= 4.0alpha48 movies yet"
fourcc DIVX,divx
fourcc DIV1,div1 divx
fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
@@ -377,6 +378,17 @@ videocodec asv1
out UYVY
out BGR32,BGR24,BGR15 flip
+videocodec null
+ info "NULL codec (no decoding)"
+ status working
+ comment "for unknown/unsupported codecs or testing"
+ driver null
+ out YV12
+ out I420
+ out YUY2
+ out UYVY
+ out BGR32,BGR24,BGR16,BGR15
+
;=============================================================================
; AUDIO CODECS
;=============================================================================