summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf7
1 files changed, 0 insertions, 7 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index d353bb5716..f80d717043 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1367,13 +1367,6 @@ videocodec geomp4
; ijpg only decodes JPEG images (no MJPEG), 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"
status working