summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-08-30 16:48:52 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:15:49 +0200
commit0f985365fbb041e93c5f7cef0771631f281ca393 (patch)
tree509f0fc56da51f7fa2f5f9014259a301e9153267 /etc
parent343bdac280da20969a5d6a35bf23c64d2e82dcf2 (diff)
downloadmpv-0f985365fbb041e93c5f7cef0771631f281ca393.tar.bz2
mpv-0f985365fbb041e93c5f7cef0771631f281ca393.tar.xz
codecs.conf: add fourcc AMV2, WAWV
add binary codec for fourcc AMV2 add fourcc WAWV to ffodivx and ffodivxvdpau git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32034 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf14
1 files changed, 11 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 4ab87f40fc..dc9e46bb31 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -97,6 +97,14 @@ videocodec imm4
dll "VCMIMM4.dll"
out BGR15 flip
+videocodec amv2
+ info "lossless video codec"
+ status working
+ fourcc AMV2
+ driver vfw
+ dll "amv2codec.dll"
+ out BGR32 flip
+
videocodec lzocodec
info "lzo lossless"
status working
@@ -1036,7 +1044,7 @@ videocodec ffodivx
fourcc FFDS
fourcc DCOD,MVXM,EM4A,PM4V
fourcc M4T3,DMK2,DIGI,INMC
- fourcc EPHV,SN40
+ fourcc EPHV,SN40,WAWV
fourcc uldx,ULDX,VSPX
fourcc SIPP ; Samsung SHR-6040
driver ffmpeg
@@ -1069,7 +1077,7 @@ videocodec ffodivxvdpau
fourcc FFDS
fourcc DCOD,MVXM,EM4A,PM4V
fourcc M4T3,DMK2,DIGI,INMC
- fourcc EPHV,SN40
+ fourcc EPHV,SN40,WAWV
fourcc uldx,ULDX,VSPX
fourcc SIPP ; Samsung SHR-6040
driver ffmpeg
@@ -1122,7 +1130,7 @@ videocodec xvid
fourcc FFDS
fourcc DCOD,MVXM,EM4A,PM4V
fourcc M4T3,DMK2,DIGI,INMC
- fourcc EPHV,SN40
+ fourcc EPHV,SN40,WAWV
fourcc uldx,ULDX,VSPX
format 0x10000004 ; mpeg 4 es
fourcc SIPP ; Samsung SHR-6040