diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
commit | dc7f1830224e1953fb07ffcc045735b2b15af310 (patch) | |
tree | 3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /etc | |
parent | 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (diff) | |
parent | a0601ed2566d132fec57dcf163372f9f341f3c13 (diff) | |
download | mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.bz2 mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.xz |
Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 9c7751b909..8f05bf9203 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -9,6 +9,14 @@ release 20090308 ; VIDEO CODECS ;============================================================================= +videocodec ffcdgraphics + info "FFmpeg CD-Graphics" + status working + fourcc CDGR ; internal MPlayer FourCC + driver ffmpeg + dll cdgraphics + out BGR8 + videocodec ffmvi1 info "FFmpeg Motion Pixels" status working @@ -520,6 +528,22 @@ videocodec ffcyuv dll "cyuv" out 411P +videocodec ffaura + info "Auravision Aura (libavcodec)" + status working + fourcc aura,AURA + driver ffmpeg + dll "aura" + out 411P + +videocodec ffaura2 + info "Auravision Aura 2 (libavcodec)" + status working + fourcc aur2,AUR2 + driver ffmpeg + dll "aura2" + out 422P + videocodec ffmsrle info "Microsoft RLE" status working @@ -2048,12 +2072,19 @@ videocodec vp6 info "On2 VP6 Personal Codec" status working fourcc VP60,VP61,VP62 - fourcc VP6F VP60 driver vfwex dll "vp6vfw.dll" out YUY2 out BGR32,BGR24 +videocodec vp6f + info "On2 VP6F Personal Codec" + status working + fourcc VP6F VP60 + driver vfwex + dll "vp6vfw.dll" + out YUY2,BGR32,BGR24 flip + videocodec vp7 info "On2 VP7 Personal Codec" status working |