summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 05:02:38 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 16:03:11 +0200
commit626d5ed6285309da621a5665ad9eb03c227ce71d (patch)
tree384b1e5838162d6bccc4ee4b6de7c476e1827894 /etc
parentb138ca43caee2115778ad9e039dcfdeddf5bfbb9 (diff)
downloadmpv-626d5ed6285309da621a5665ad9eb03c227ce71d.tar.bz2
mpv-626d5ed6285309da621a5665ad9eb03c227ce71d.tar.xz
vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
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