summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:06:10 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:14:55 +0300
commit2f1a518d4572bdad2cacd8e8bc25df93acffa9b4 (patch)
tree7529956ac00a3789a4aa3310fd6c80518a6773f5 /etc
parent9b68a49d0132bbe08d3a9bf7a19276801ac415aa (diff)
parentd852b590a2aefad3c2050cf2741b4c51af8735ca (diff)
downloadmpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.bz2
mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.xz
Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index cbd8e58233..aabe527647 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1003,6 +1003,7 @@ videocodec ffodivx
fourcc M4T3,DMK2,DIGI,INMC
fourcc EPHV,SN40
fourcc uldx,ULDX,VSPX
+ fourcc SIPP ; Samsung SHR-6040
driver ffmpeg
dll mpeg4 ;opendivx
out YV12,I420,IYUV