diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
commit | efcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch) | |
tree | eb15edb75377eedd5d7397209e8c0d594020663e /etc/codecs.conf | |
parent | 1598302be65c77c107330dc46fd0dabface3112d (diff) | |
parent | 8fcbe5835d038649e70da410d46c4f5cd502c261 (diff) | |
download | mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2 mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz |
Merge svn changes up to r30055
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 49faf25322..9c7751b909 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -76,6 +76,14 @@ videocodec yuv8 out YV12,I420,UYVY out BGR24,BGR15,BGR32 +videocodec ffr210 + info "FFmpeg R210 - 10-bit RGB" + status working + fourcc r210 + driver ffmpeg + dll "r210" + out RGB48BE,RGB48LE + videocodec blackmagic info "Blackmagic 10-bit" status working @@ -162,6 +170,7 @@ videocodec ffmpeg2 fourcc m2v1 fourcc PIM2 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -200,6 +209,7 @@ videocodec ffmpeg12 fourcc mp2v,mpgv fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -1265,6 +1275,8 @@ videocodec ffmjpeg fourcc SLMJ ; SL M-JPEG fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec + fourcc avi1,avi2 + fourcc MTSJ driver ffmpeg dll mjpeg out 444P @@ -1340,6 +1352,7 @@ videocodec LEAD fourcc MJPG fourcc jpeg MJPG ; MOV Photo-JPEG fourcc LEAD + fourcc MTSJ MJPG driver vfw dll "LCodcCMP.dll" out BGR24,BGR15 |