summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-04 20:03:17 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-04 20:03:17 +0000
commit41090d9161c0a3e86b88f0509884dcbc5573fdf2 (patch)
tree29acaee413d64bc4b6cdc410f872018e88326584 /etc
parent96dfb6e86021b3f734d0c132000a92c322f9ba89 (diff)
downloadmpv-41090d9161c0a3e86b88f0509884dcbc5573fdf2.tar.bz2
mpv-41090d9161c0a3e86b88f0509884dcbc5573fdf2.tar.xz
zoran mjpeg passthrough 'decoder'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11390 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 88be76d7e3..8717529448 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -612,6 +612,13 @@ videocodec ubmp4
; ijpg only decodes jpeg images (no mjpg), and slow.
; Update: ffmjpeg is almost perfect (and optimized) now, prefer it to others.
+videocodec zrmjpeg
+ info "Zoran MJPEG passthrough"
+ status buggy
+ fourcc MJPG,jpeg
+ driver zrmjpeg
+ out ZRMJPEGNI,ZRMJPEGIT,ZRMJPEGIB query
+
videocodec ffmjpeg
info "FFmpeg MJPEG decoder"
status working