summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-26 16:09:06 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-26 16:09:06 +0000
commit3123d3faa1fed98517047a28cd960226d8703f61 (patch)
tree7086ad90b6ea62a865bf5c0249681d2e6edda8b9 /etc
parent2e5db5d656bf3d3108bf0c49e318942e2defe845 (diff)
downloadmpv-3123d3faa1fed98517047a28cd960226d8703f61.tar.bz2
mpv-3123d3faa1fed98517047a28cd960226d8703f61.tar.xz
corrected some fourcc's at xanim dll's and corrected mov mp3,ulaw,alaw
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2486 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf20
1 files changed, 12 insertions, 8 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 85be69f77d..09c51aab39 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -179,7 +179,7 @@ videocodec ffi263
videocodec ffh263
info "FFmpeg H263+ decoder"
status working
- fourcc H263,U263
+ fourcc H263,U263,h263
driver ffmpeg
dll h263
out YV12
@@ -511,15 +511,16 @@ videocodec 3ivXxa
videocodec h263xa
info "CCITT H.263"
status untested
- fourcc h263
+ fourcc H263,h263
driver xanim
dll "vid_h263.xa"
out YV12,IYUV,I420
+ comment "only tested with one buggy movie"
videocodec h261xa
info "CCITT H.261"
status untested
- fourcc i263
+ fourcc H261,h261
driver xanim
dll "vid_h261.xa"
out YV12,IYUV,I420
@@ -584,8 +585,8 @@ audiocodec mp3
comment "Optimized to MMX/SSE/3Dnow!"
format 0x50
format 0x55
- format 0x33706d2e ; ".mp3" VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" CBR MP3 (MOV files)
+ format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
driver mp3lib
dll "mp3lib (mpglib)"
flags seekable
@@ -597,8 +598,8 @@ audiocodec mad
comment "Optimized for ARM"
format 0x50
format 0x55
- format 0x33706d2e ; ".mp3" VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" CBR MP3 (MOV files)
+ format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
driver libmad
dll "libmad"
flags seekable
@@ -608,6 +609,8 @@ audiocodec ffmp3
status working
format 0x50
format 0x55
+ format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
driver ffmpeg
dll "mpegaudio"
flags seekable
@@ -649,6 +652,7 @@ audiocodec alaw
info "aLaw"
status working
format 0x6
+ format 0x77616c75 ; "ulaw" (MOV files)
driver alaw
dll "alaw"
@@ -656,7 +660,7 @@ audiocodec ulaw
info "uLaw"
status working
format 0x7
- format 0x66515c75 ; "ulaw" (MOV files)
+ format 0x77616c61 ; "ulaw" (MOV files)
driver alaw
dll "ulaw"