diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-16 22:28:12 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-16 22:28:12 +0300 |
commit | e1ecc4315265c465080616b8d8d9257b3aab6ee9 (patch) | |
tree | d8a3aacf1b5468c59da202e44c5035924f5c1a3e /etc | |
parent | 0e1b7765be878491565cf5e471f22b15e106164c (diff) | |
parent | 4dae2a980c4313deed6ddb69556d2ead4417119c (diff) | |
download | mpv-e1ecc4315265c465080616b8d8d9257b3aab6ee9.tar.bz2 mpv-e1ecc4315265c465080616b8d8d9257b3aab6ee9.tar.xz |
Merge svn changes up to r29684
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index fd9a484c09..782ff61809 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -414,6 +414,14 @@ videocodec mtga driver mtga out BGR32,BGR24 +videocodec ffsgi + info "FFmpeg SGI image" + status working + fourcc SGI1 ; SGI1 is an internal MPlayer FOURCC + driver ffmpeg + dll sgi + out RGB24,Y800,RGB48BE + videocodec sgi info "SGI image" status working @@ -2209,6 +2217,15 @@ videocodec webtrain dll "wtvc.dll" out BGR16 flip +videocodec kegavideo + info "Kega Video" + comment "requires MSVCR80.DLL on windows" + status working + fourcc KGV1 + driver vfw + dll "KGV1-VFW.dll" + out BGR16 flip + videocodec xfire info "xfire video" status working @@ -3991,7 +4008,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio" status working - comment "fixed-point decoder useful systems without floating-point unit" + comment "fixed-point decoder useful for systems without floating-point unit" fourcc vrbs format 0x566F driver tremor @@ -4105,6 +4122,14 @@ audiocodec pscelp driver acm dll "smcelp32.acm" +audiocodec fftwinvq + info "FFmpeg TwinVQ" + status working + fourcc TWI2 ; internal MPlayer FourCC, different from mplayer's TwinVQ decoder + ; since lavf demuxer is incompatible with it + driver ffmpeg + dll twinvq + audiocodec TwinVQ info "VQF codec by NTTLabs" status working |