summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-30 00:53:08 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-30 00:56:10 +0200
commitd46b86bc7c39082b26ec71aa16431f3275d836ff (patch)
tree035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /etc
parenta06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff)
parent3e8f2815c19703f5cb6f75db2910234d499d9676 (diff)
downloadmpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2
mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf107
1 files changed, 106 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8f05bf9203..5f22c31a2d 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2891,7 +2891,7 @@ videocodec ffinterplay
fourcc INPV ; internal MPlayer FourCC
driver ffmpeg
dll "interplayvideo"
- out BGR8
+ out BGR8,BGR15
videocodec ffvqa
info "FFmpeg VQA Video"
@@ -3161,6 +3161,111 @@ videocodec rawy800
fourcc y800,Y800
out Y800,Y8
+;lavc raw codecs
+
+videocodec ffrawyuy2
+ info "RAW YUY2"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc yuy2,YUY2
+ fourcc V422,v422
+ fourcc YUNV,yunv
+ fourcc VYUY,vyuy
+ fourcc yuvs,YUVS
+ driver ffmpeg
+ dll rawvideo
+ out YUY2
+
+videocodec ffrawyuv2
+ info "RAW YUV2"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc yuv2,YUV2
+ driver ffmpeg
+ dll rawvideo
+ out YUY2
+
+videocodec ffrawuyvy
+ info "RAW UYVY"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc uyvy,UYVY
+ fourcc HDYC,hdyc
+ fourcc UYNV,uynv
+ fourcc UYNY,uyny
+ fourcc uyv1,UYV1
+ fourcc 2Vu1,2vu1,2VU1
+ fourcc 2Vuy,2vuy,2VUY
+ driver ffmpeg
+ dll rawvideo
+ out UYVY
+
+videocodec ffraw444P
+ info "RAW 444P"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc 444p,444P
+ driver ffmpeg
+ dll rawvideo
+ out 444P
+
+videocodec ffraw422P
+ info "RAW 422P"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc 422p,422P
+ fourcc P422,p422
+ fourcc Y42B,y42b
+ driver ffmpeg
+ dll rawvideo
+ out 422P
+
+videocodec ffrawyv12
+ info "RAW YV12"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc yv12,YV12
+ driver ffmpeg
+ dll rawvideo
+ out YV12
+
+videocodec ffrawi420
+ info "RAW I420"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc i420,I420
+ fourcc IYUV,iyuv
+ driver ffmpeg
+ dll rawvideo
+ out I420,IYUV
+
+videocodec ffrawyvu9
+ info "RAW YVU9"
+ status working
+ format 0x0
+ format 0x20776172
+ fourcc yvu9,YVU9
+ driver ffmpeg
+ dll rawvideo
+ out YVU9
+
+videocodec ffrawy800
+ info "RAW Y8/Y800"
+ status working
+ format 0x0
+ format 0x20203859 ; "Y8 "
+ fourcc y800,Y800
+ driver ffmpeg
+ dll rawvideo
+ out Y800,Y8
+
; NULL codec - for testing.
videocodec null