From 3dfee062b1deea85676710aa1b559b6d1ee81c47 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Jan 2010 20:12:06 +0000
Subject: map zjpeg to ffmjpeg in codecs.conf

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30229 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc')

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
-- 
cgit v1.2.3