summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-22 23:51:27 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-22 23:51:27 +0000
commitdbd704ce0faabcf2c81e5e7562fb233fa0ae6709 (patch)
treea9129624078402ce737637987445e79435bb0997 /etc
parentc9699e9734dd5e2036eccfcca33f85d696aeab9f (diff)
downloadmpv-dbd704ce0faabcf2c81e5e7562fb233fa0ae6709.tar.bz2
mpv-dbd704ce0faabcf2c81e5e7562fb233fa0ae6709.tar.xz
added xanim support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2393 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf41
1 files changed, 35 insertions, 6 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 35197604fb..c4eca4e736 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -148,8 +148,8 @@ videocodec mjpeg
info "Motion JPEG"
status working
fourcc MJPG
-; fourcc mjpa ; MOV files
-; fourcc mjpb ; MOV files
+ fourcc mjpa ; MOV files
+ fourcc mjpb ; MOV files
driver vfw
dll "mcmjpg32.dll"
; dll "m3jpeg32.dll"
@@ -416,7 +416,6 @@ videocodec mwv1
out YUY2
out BGR32,BGR24,BGR15
-
videocodec m261
info "M261"
status untested
@@ -462,10 +461,34 @@ videocodec 3ivx
driver dshow
dll "3ivxdmo.dll"
guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
- out YUY2
- out UYVY
+; out YUY2
+; out UYVY
out BGR32,BGR24,BGR16,BGR15
+videocodec indeo5xa
+ info "Intel Indeo 5"
+ status buggy
+ fourcc IV50,iv50
+ driver xanim
+ dll "vid_iv50_1.0_linuxELFx86c6.xa"
+ out YV12,IYUV,I420
+
+videocodec cvidxa
+ info "Radius Cinepak Video"
+ status working
+ fourcc cvid
+ driver xanim
+ dll "vid_cvid_2.1_linuxELFx86c6.xa"
+ out YV12,IYUV,I420
+
+videocodec 3ivXxa
+ info "3ivX"
+ status working
+ fourcc 3IV1
+ driver xanim
+ dll "vid_3ivX_d3.5_linuxELFx86c6.xa"
+ out YV12,IYUV,I420
+
videocodec null
info "NULL codec (no decoding)"
status working
@@ -520,7 +543,7 @@ audiocodec mp3
format 0x50
format 0x55
format 0x33706d2e ; ".mp3" VBR MP3 (MOV files)
- format 0x4400736d ; "ms\0\x55" CBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" CBR MP3 (MOV files)
driver mp3lib
dll "mp3lib (mpglib)"
flags seekable
@@ -640,3 +663,9 @@ audiocodec vorbis
; driver acm
; dll "vorbis.acm"
+;audiocodec ima4
+; info "IMA4:1"
+; status buggy
+; format 0x34616d69 ; "ima4" (MOV files)
+; driver ima4
+; dll "ima4.c"