summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:25:04 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:25:04 +0300
commit8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9 (patch)
treea7be3f915e6d2d8a3d06544fbbdd692dcf19956d /etc
parent78f51a921f0141362fc95f215ffade5e87d87578 (diff)
parentc36de0867fc576ad5fd58fc28bd5fe3322579f36 (diff)
downloadmpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.bz2
mpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.xz
Merge svn changes up to r31226
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf10
1 files changed, 10 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index aabe527647..046fece1db 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1036,6 +1036,7 @@ videocodec ffodivxvdpau
fourcc M4T3,DMK2,DIGI,INMC
fourcc EPHV,SN40
fourcc uldx,ULDX,VSPX
+ fourcc SIPP ; Samsung SHR-6040
driver ffmpeg
dll mpeg4_vdpau
out VDPAU_MPEG4
@@ -1089,6 +1090,7 @@ videocodec xvid
fourcc EPHV,SN40
fourcc uldx,ULDX,VSPX
format 0x10000004 ; mpeg 4 es
+ fourcc SIPP ; Samsung SHR-6040
driver xvid
out YV12
out I420
@@ -2172,6 +2174,14 @@ videocodec vp7
out YUY2
out BGR32,BGR24
+videocodec fflibvpx
+ info "FFmpeg wrapper for libvpx/VP8"
+ status working
+ fourcc VP80
+ driver ffmpeg
+ dll "libvpx"
+ out YV12
+
videocodec mwv1
info "Motion Wavelets"
status working