Cinepak, CYUV and RoqA/V are now in ffmpeg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12828 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 4 insertions, 45 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8b31acc1a6..3e8845e196 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -168,15 +168,6 @@ videocodec ffcyuv
   dll "cyuv"
   out 411P
 
-videocodec cyuv
-  info "Creative YUV (native codec)"
-  status working
-  fourcc cyuv,CYUV
-  driver cyuv
-  out 411P
-  out YUY2,UYVY
-  out 422P
-
 videocodec ffmsrle
   info "Microsoft RLE"
   status working
@@ -188,21 +179,12 @@ videocodec ffmsrle
 
 videocodec ffroqvideo
   info "Id RoQ File Video Decoder"
-  status buggy
-  comment "buggy"
+  status working
   fourcc RoQV ; RoQV is an internal MPlayer FOURCC
   driver ffmpeg
   dll "roqvideo"
   out YV12
 
-videocodec roqvideo
-  info "Id RoQ File Video Decoder"
-  status buggy
-  comment "buggy"
-  fourcc RoQV ; RoQV is an internal MPlayer FOURCC
-  driver roqvideo
-  out YV12
-
 videocodec lzo
   info "LZO compressed"
   status working
@@ -278,15 +260,6 @@ videocodec ffvideo1
   dll "msvideo1"
   out BGR15,BGR8 query
 
-videocodec cvid
-  info "Cinepak Video (native codec)"
-  status working
-  fourcc cvid,CVID
-  driver cinepak
-  out YV12,I420,IYUV
-  out YUY2
-  out BGR32,BGR24
-
 videocodec ffmszh
   info "AVImszh (native codec)"
   status working
@@ -2016,12 +1989,6 @@ audiocodec ffroqaudio
   driver ffmpeg
   dll "roq_dpcm"
 
-audiocodec roqaudio
-  info "Id RoQ File Audio Decoder"
-  status working
-  fourcc RoQA ; RoQA is an internal MPlayer FOURCC
-  driver roqaudio
-
 audiocodec libdv
   info "raw DV audio decoder (libdv)"
   status working
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 78c2d85b70..380f77f43d 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -5,12 +5,12 @@ LIBNAME = libmpcodecs.a
 LIBNAME2 = libmpencoders.a
 
 AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
-AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_roqaudio.c ad_ra1428.c
+AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_ra1428.c
 AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
 AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
 
 VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
-VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_raw.c vd_hmblck.c vd_roqvideo.c vd_cyuv.c vd_mpegpes.c vd_mtga.c vd_sgi.c
+VIDEO_SRCS_NAT=vd_null.c vd_raw.c vd_hmblck.c vd_mpegpes.c vd_mtga.c vd_sgi.c
 VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_zrmjpeg.c vd_xanim.c vd_xvid.c vd_xvid4.c vd_libdv.c vd_qtvideo.c vd_theora.c
 VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
 
@@ -21,7 +21,7 @@ endif
 
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_raw.c ve_libdv.c ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c
 
-NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/minilzo.c native/nuppelvideo.c native/roqav.c native/xa_gsm.c native/decode144.c native/decode288.c
+NATIVE_SRCS=native/RTjpegN.c native/minilzo.c native/nuppelvideo.c native/xa_gsm.c native/decode144.c native/decode288.c
 
 ifeq ($(FAME),yes)
 VFILTER_SRCS += vf_fame.c
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index e813078fa1..c3614ef4f9 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -27,7 +27,6 @@ extern ad_functions_t mpcodecs_ad_imaadpcm;
 extern ad_functions_t mpcodecs_ad_msadpcm;
 extern ad_functions_t mpcodecs_ad_dk3adpcm;
 extern ad_functions_t mpcodecs_ad_dk4adpcm;
-extern ad_functions_t mpcodecs_ad_roqaudio;
 extern ad_functions_t mpcodecs_ad_dshow;
 extern ad_functions_t mpcodecs_ad_dmo;
 extern ad_functions_t mpcodecs_ad_acm;
@@ -59,7 +58,6 @@ ad_functions_t* mpcodecs_ad_drivers[] =
   &mpcodecs_ad_imaadpcm,
   &mpcodecs_ad_msadpcm,
   &mpcodecs_ad_dk3adpcm,
-  &mpcodecs_ad_roqaudio,
   &mpcodecs_ad_msgsm,
 #ifdef USE_WIN32DLL
 #ifdef USE_DIRECTSHOW
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index cb29b79fda..467532f684 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -28,7 +28,6 @@
 //#include "vd_internal.h"
 
 extern vd_functions_t mpcodecs_vd_null;
-extern vd_functions_t mpcodecs_vd_cinepak;
 extern vd_functions_t mpcodecs_vd_ffmpeg;
 extern vd_functions_t mpcodecs_vd_theora;
 extern vd_functions_t mpcodecs_vd_dshow;
@@ -40,8 +39,6 @@ extern vd_functions_t mpcodecs_vd_divx4;
 extern vd_functions_t mpcodecs_vd_raw;
 extern vd_functions_t mpcodecs_vd_hmblck;
 extern vd_functions_t mpcodecs_vd_xanim;
-extern vd_functions_t mpcodecs_vd_roqvideo;
-extern vd_functions_t mpcodecs_vd_cyuv;
 extern vd_functions_t mpcodecs_vd_nuv;
 extern vd_functions_t mpcodecs_vd_mpng;
 extern vd_functions_t mpcodecs_vd_ijpg;
@@ -58,7 +55,6 @@ extern vd_functions_t mpcodecs_vd_qtvideo;
 
 vd_functions_t* mpcodecs_vd_drivers[] = {
         &mpcodecs_vd_null,
-        &mpcodecs_vd_cinepak,
 #ifdef USE_LIBAVCODEC
         &mpcodecs_vd_ffmpeg,
 #endif
@@ -82,8 +78,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
         &mpcodecs_vd_lzo,
         &mpcodecs_vd_raw,
         &mpcodecs_vd_hmblck,
-        &mpcodecs_vd_roqvideo,
-        &mpcodecs_vd_cyuv,
         &mpcodecs_vd_nuv,
 #ifdef USE_XANIM
         &mpcodecs_vd_xanim,