diff options
| author |  voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-30 03:49:22 +0000 |
|---|---|---|
| committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-30 03:49:22 +0000 |
| commit | 2b9b8737078dea62fb467bd65fd1ca9b7d9daa6a (patch) | |
| tree | bed24dcc13b0e98da811cf39a1eb4d872b9f44cd /etc | |
| parent | 465cc5fb0ec0fec9df04db8702bb83b5c5623755 (diff) | |
AMV demuxer and audio/video decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24673 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 92a0b7debf..1f97a3fe13 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3,7 +3,7 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20070511 +release 20070930 ;============================================================================= ; VIDEO CODECS @@ -1598,6 +1598,14 @@ videocodec tm20 guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84 out BGR32,BGR24,BGR16 flip +videocodec ffamv + info "Modified MJPEG, used in AMV files" + status working + fourcc AMVV ; internal MPlayer FourCC + driver ffmpeg + dll "amv" + out YV12 + videocodec ffsp5x info "SP5x codec - used by Aiptek MegaCam" status working @@ -2564,6 +2572,13 @@ audiocodec raatrcmac driver realaud dll "atrc.bundle/Contents/MacOS/atrc" +audiocodec ffadpcmimaamv + info "FFmpeg AMV IMA ADPCM audio" + status working + format 0x01 + driver ffmpeg + dll adpcm_ima_amv + audiocodec imaadpcm info "IMA ADPCM" status working |