summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-11 14:46:09 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-11 14:46:09 +0000
commit46586160bd6f0d56c92c4e3d7df307bbfb202caf (patch)
tree449e58eb7b90733bf898ebff2f72891e0ff0eb4f /etc
parent3bf5010cd19d2034fd1b7b6a6daece1046707f64 (diff)
downloadmpv-46586160bd6f0d56c92c4e3d7df307bbfb202caf.tar.bz2
mpv-46586160bd6f0d56c92c4e3d7df307bbfb202caf.tar.xz
dshow codec is preferred for mp42 - it does postprocess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2166 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf29
1 files changed, 15 insertions, 14 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8cb10b816b..ff6ab376fd 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -47,22 +47,10 @@ videocodec mpeg12
dll "libmpeg2"
out YV12
-videocodec mpeg4
- info "Microsoft MPEG-4 v1/v2"
- status working
-; comment "No postprocessing"
- fourcc MPG4,mpg4
- fourcc MP42,mp42
- fourcc DIV2 mp42
- driver vfw
- dll "mpg4c32.dll"
- out YUY2 yuvhack
- out BGR32,BGR24,BGR15
-
videocodec mpeg4ds
info "Microsoft MPEG-4 v1/v2"
status working
-; comment "with postprocessing"
+ comment "with postprocessing"
fourcc DIV2,div2 mp42
fourcc MPG4,mpg4
fourcc MP42,mp42
@@ -72,6 +60,18 @@ videocodec mpeg4ds
out YUY2
out BGR32,BGR24,BGR16,BGR15
+videocodec mpeg4
+ info "Microsoft MPEG-4 v1/v2"
+ status working
+; comment "No postprocessing"
+ fourcc MPG4,mpg4
+ fourcc MP42,mp42
+ fourcc DIV2 mp42
+ driver vfw
+ dll "mpg4c32.dll"
+ out YUY2 yuvhack
+ out BGR32,BGR24,BGR15
+
videocodec divx
info "DivX ;-) (MS MPEG-4 v3)"
status working
@@ -540,7 +540,8 @@ audiocodec msgsmacm
format 0x31
format 0x32
driver acm
- dll "msgsm32.acm"
+ dll "msnaudio.acm"
+; dll "msgsm32.acm"
audiocodec msgsm
info "MS GSM"