summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-13 17:08:29 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-13 17:08:29 +0000
commitda01b889d7e2352b46875e5fd6836bc67dd64536 (patch)
tree12328c7def7168da98e518240bc67ac2ef4b6075 /etc
parent88ac91a8150f3518458ede3f5b8107c179bcfccf (diff)
downloadmpv-da01b889d7e2352b46875e5fd6836bc67dd64536.tar.bz2
mpv-da01b889d7e2352b46875e5fd6836bc67dd64536.tar.xz
add SLMJ fourcc to ffmjpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28310 b3059339-0415-0410-9bf9-f77b7e298cf2
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 c56321a401..5f3d13dff2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1095,6 +1095,7 @@ videocodec ffmjpeg
fourcc MJLS ; JPEG-LS custom FOURCC for avi - encoder
fourcc MMJP,QIVG
fourcc ACDV ; ACDSee jpeg
+ fourcc SLMJ ; SL M-JPEG
driver ffmpeg
dll mjpeg
out 444P