diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
| commit | ebb4abf2081026c63bb5c983f76447d9d2413656 (patch) | |
| tree | f2b3ed868645fd2546173be3500f4c3e0cdf3ecc /etc | |
| parent | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (diff) | |
| parent | 20571d6f6870dab84624cc6b6fbac82cde204f16 (diff) | |
| download | mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.bz2 mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.xz | |
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 40a1f90548..a4989bc057 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -66,6 +66,15 @@ videocodec zmbv dll "zmbv.dll" out BGR24,BGR15,BGR8 query,flip +videocodec blackmagic + info "Blackmagic 10-bit" + status working + comment "requires libguide40.dll" + fourcc r210 + driver vfw + dll "BMDCodecLib.dll" + out BGR32,RGB32 + ; MPEG-1/2 decoding: ; Note: mpegpes is preferred for hw decoders: @@ -1514,6 +1523,7 @@ videocodec ffrv20 info "FFmpeg RV20 decoder" status working fourcc RV20,rv20 + fourcc RVTR driver ffmpeg dll rv20 out YV12,I420,IYUV |