summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
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