From 626d5ed6285309da621a5665ad9eb03c227ce71d Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 31 Jan 2011 05:02:38 +0200 Subject: 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. --- etc/codecs.conf | 7 ------- 1 file changed, 7 deletions(-) (limited to 'etc') 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 -- cgit v1.2.3