summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-05 20:12:06 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-05 20:12:06 +0000
commit3dfee062b1deea85676710aa1b559b6d1ee81c47 (patch)
treed4cb407aabb3ea78dd4eb72a592d4cc5731e145c /etc
parent41486125799e648ca07b1c4c237664d19e19db8e (diff)
downloadmpv-3dfee062b1deea85676710aa1b559b6d1ee81c47.tar.bz2
mpv-3dfee062b1deea85676710aa1b559b6d1ee81c47.tar.xz
map zjpeg to ffmjpeg in codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30229 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a52064b702..0cb203e2b2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1300,7 +1300,7 @@ videocodec ffmjpeg
fourcc MVJP ; Midvid JPEG Video Codec
fourcc IJLV ; Intel JPEG Library Video Codec
fourcc avi1,avi2
- fourcc MTSJ
+ fourcc MTSJ,ZJPG
driver ffmpeg
dll mjpeg
out 444P