summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-06 23:57:18 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-06 23:57:18 +0000
commitf7fafb68fa80429f4b0964a5d4337ecbc52199a8 (patch)
tree1d304732c743ea79f22716483a849f202c9cb388 /DOCS
parentb27916f48f8c2f4414b75a48f6165326b65014ce (diff)
downloadmpv-f7fafb68fa80429f4b0964a5d4337ecbc52199a8.tar.bz2
mpv-f7fafb68fa80429f4b0964a5d4337ecbc52199a8.tar.xz
new ffmpeg codecs added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/codecs.conf69
1 files changed, 47 insertions, 22 deletions
diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index f0594c0f48..2c5922935e 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -113,8 +113,54 @@ videocodec divx4
out UYVY
out BGR32,BGR24,BGR16,BGR15
+videocodec i263
+ info "I263"
+ status working
+ fourcc I263,i263,I420,i420
+ driver vfw
+ dll "i263_32.drv"
+; out I420
+ out YUY2
+ out BGR32,BGR24,BGR15
+
+videocodec mjpeg
+ info "Motion JPEG"
+ status working
+ fourcc MJPG
+ driver vfw
+ dll "mcmjpg32.dll"
+; dll "m3jpeg32.dll"
+ out YUY2
+ out UYVY
+ out BGR32,BGR24,BGR15
+
; =============== FFMPEG MPEG CODECS =========================
+videocodec ffmjpeg
+ info "FFmpeg MJPEG decoder"
+ status working
+ fourcc MJPG,mjpg
+ driver ffmpeg
+ dll mjpeg
+; out YUY2
+ out YV12
+
+videocodec ffi263
+ info "FFmpeg I263 decoder"
+ status working
+ fourcc I263,i263
+ driver ffmpeg
+ dll h263i
+ out YV12
+
+videocodec ffh263
+ info "FFmpeg H263+ decoder"
+ status untested
+ fourcc H263,U263
+ driver ffmpeg
+ dll h263
+ out YV12
+
videocodec ffdivx
info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
status working
@@ -144,7 +190,7 @@ videocodec ffmpeg12
status working
format 0x10000001
driver ffmpeg
- dll "mpeg1video"
+ dll "mpegvideo"
out YV12
@@ -219,27 +265,6 @@ videocodec vcr2
out YUY2
out BGR32,BGR24,BGR15
-videocodec i263
- info "I263"
- status working
- fourcc I263,i263,I420,i420
- driver vfw
- dll "i263_32.drv"
-; out I420
- out YUY2
- out BGR32,BGR24,BGR15
-
-videocodec mjpeg
- info "Motion JPEG"
- status working
- fourcc MJPG
- driver vfw
- dll "mcmjpg32.dll"
-; dll "m3jpeg32.dll"
- out YUY2
- out UYVY
- out BGR32,BGR24,BGR15
-
videocodec wmv7
info "Windows Media Video 7"
status working