1 files changed, 0 insertions, 111 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5120406f12..e4618a92d0 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -445,13 +445,6 @@ videocodec ffsgi
   driver ffmpeg
   dll sgi
 
-videocodec sgi
-  info "SGI image"
-  status working
-  fourcc SGI1 ; SGI1 is an internal MPlayer FOURCC
-  driver sgi
-  out BGR24
-
 videocodec ffsunras
   info "FFmpeg SUN Rasterfile"
   status working
@@ -562,14 +555,6 @@ videocodec lzo
   out YV12,I420
   out BGR24 flip
 
-videocodec theora
-  info "Theora (free, reworked VP3)"
-  status working
-  fourcc theo,Thra
-  driver theora
-  dll libtheora
-  out YV12,422P,444P
-
 ; prefer native codecs over win32?
 ; the win32 codecs probably are (better) optimized and support direct
 ; rendering, so this may be not the best idea...
@@ -1099,41 +1084,6 @@ videocodec fflibdirac
   driver ffmpeg
   dll libdirac
 
-videocodec xvid
-  info "Xvid (MPEG-4)"
-  status working
-  fourcc FMP4,fmp4
-  fourcc DIVX,divx
-  fourcc xvid,XVID,XviD,XVIX
-  fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s      ; ISO MPEG-4 Video V1
-  fourcc M4S2,m4s2
-  fourcc DX50,dx50,BLZ0 DX50
-  fourcc mp4v,MP4V
-  format 0x4
-  fourcc UMP4
-  fourcc RMP4
-  fourcc 3IV2,3iv2  ; 3ivx Delta 4
-  fourcc DXGM
-  fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
-  fourcc SMP4,smp4 ; Samsung SMP4 video codec
-  fourcc VIDM ; vidm 4.01 codec
-  fourcc FFDS
-  fourcc DCOD,MVXM,EM4A,PM4V
-  fourcc M4T3,DMK2,DIGI,INMC
-  fourcc EPHV,SN40,WAWV
-  fourcc uldx,ULDX,VSPX
-  format 0x10000004  ; mpeg 4 es
-  fourcc SIPP ; Samsung SHR-6040
-  driver xvid
-  out YV12
-  out I420
-  out YUY2
-  out UYVY
-  out YVYU
-  out BGR32,BGR24,BGR16,BGR15
-  dll "libxvidcore.a"
-
 ; is divx4vfw stable enough, working everywhere and faster than divxds?
 
 videocodec divx4vfw
@@ -3860,13 +3810,6 @@ audiocodec ffadpcmimadk3
   driver ffmpeg
   dll adpcm_ima_dk3
 
-audiocodec dk3adpcm
-  info "Duck DK3 ADPCM (rogue format number)"
-  status working
-  format 0x62 ; This format number was used by Duck Corp. but not officially
-              ; registered with Microsoft
-  driver dk3adpcm
-
 audiocodec ffroqaudio
   info "Id RoQ File Audio"
   status working
@@ -4501,13 +4444,6 @@ audiocodec ffmusepack8
   driver ffmpeg
   dll "mpc8"
 
-audiocodec musepack
-  info "Musepack audio codec"
-  status  working
-  fourcc  "MPC "
-  format 0x2b4d
-  driver mpcdec
-
 audiocodec ffamrnb
   info "AMR Narrowband"
   status working
@@ -4630,46 +4566,6 @@ audiocodec ffvorbis
   driver ffmpeg
   dll "vorbis"
 
-audiocodec vorbis
-  info "OggVorbis Audio"
-  status working
-  comment "OggVorbis driver using libvorbis"
-  fourcc vrbs
-  format 0x566F
-  driver libvorbis
-  dll "libvorbis"
-
-audiocodec tremor
-  info "OggVorbis audio"
-  status working
-  comment "fixed-point decoder useful for systems without floating-point unit"
-  fourcc vrbs
-  format 0x566F
-  driver tremor
-  dll "tremor"
-
-audiocodec vorbisacm
-  info "OggVorbis ACM"
-  status working
-  comment "OggVorbis driver using vorbis.acm"
-  format 0x674F ; mode1
-  format 0x6750 ; mode2
-;  format 0x6751 ; mode3
-  format 0x676F ; mode1+
-  format 0x6770 ; mode2+
-  format 0x6771 ; mode3+
-  driver acm
-  dll "vorbis.acm"
-
-audiocodec speex
-  info "Speex audio"
-  status working
-  comment "Speex driver using libspeex"
-  fourcc 'spx '
-  format 0xA109
-  driver speex
-  dll "speex"
-
 audiocodec vivoaudio
   info "Vivo G.723/Siren Audio Codec"
   status working
@@ -4797,13 +4693,6 @@ audiocodec fftwinvq
   driver ffmpeg
   dll twinvq
 
-audiocodec TwinVQ
-  info "VQF codec by NTTLabs"
-  status working
-  fourcc TWIN
-  driver vqf
-  dll "tvqdec.dll"
-
 audiocodec hwmpa
   info "MPEG audio pass-through for hardware MPEG decoders"
   status working