Fri Aug 30 23:44:24 CEST 2002

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv3247/libmpcodecs

Modified Files:
	ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c 
	ad_faad.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_liba52.c 
	ad_libdv.c ad_libmad.c ad_libvorbis.c ad_mp3lib.c ad_msadpcm.c 
	ad_msgsm.c ad_pcm.c ad_realaud.c ad_roqaudio.c ad_sample.c 
	dec_audio.c dec_video.c dec_video.h mpc_info.h vd.c 
	vd_cinepak.c vd_cyuv.c vd_divx4.c vd_dshow.c vd_ffmpeg.c 
	vd_fli.c vd_huffyuv.c vd_ijpg.c vd_libdv.c vd_libmpeg2.c 
	vd_mpegpes.c vd_mpng.c vd_msrle.c vd_msvidc.c vd_nuv.c 
	vd_odivx.c vd_qtrle.c vd_qtrpza.c vd_qtsmc.c vd_raw.c 
	vd_realvid.c vd_rle.c vd_roqvideo.c vd_svq1.c vd_vfw.c 
	vd_vfwex.c vd_xanim.c vd_xvid.c vd_zlib.c 
Log Message:
-afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- ad_acm.c	1 Apr 2002 13:26:03 -0000	1.3
+++ ad_acm.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -14,7 +14,6 @@
 {
 	"Win32 ACM audio decoder",
 	"acm",
-	AFM_ACM,
 	"Nick Kurshev",
 	"avifile.sf.net",
 	""

Index: ad_alaw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_alaw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_alaw.c	25 Mar 2002 21:06:01 -0000	1.1
+++ ad_alaw.c	30 Aug 2002 21:44:20 -0000	1.2
@@ -9,7 +9,6 @@
 {
 	"aLaw/uLaw audio decoder",
 	"alaw",
-	AFM_ALAW,
 	"Nick Kurshev",
 	"A'rpi",
 	""

Index: ad_dk3adpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dk3adpcm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_dk3adpcm.c	3 Apr 2002 21:37:26 -0000	1.4
+++ ad_dk3adpcm.c	30 Aug 2002 21:44:20 -0000	1.5
@@ -20,7 +20,6 @@
 {
 	"Duck DK3 ADPCM decoder",
 	"dk3adpcm",
-	AFM_DK3ADPCM,
 	"Nick Kurshev",
 	"Mike Melanson",
 	"This format number was used by Duck Corp. but not officially registered with Microsoft"

Index: ad_dshow.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dshow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_dshow.c	1 Apr 2002 17:57:51 -0000	1.4
+++ ad_dshow.c	30 Aug 2002 21:44:20 -0000	1.5
@@ -14,7 +14,6 @@
 {
 	"Win32/DirectShow decoders",
 	"dshow",
-	AFM_DSHOW,
 	"Nick Kurshev",
 	"avifile.sf.net",
 	""

Index: ad_dvdpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dvdpcm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_dvdpcm.c	25 Apr 2002 11:03:33 -0000	1.2
+++ ad_dvdpcm.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 {
 	"Uncompressed DVD PCM audio decoder",
 	"dvdpcm",
-	AFM_DVDPCM,
 	"Nick Kurshev",
 	"A'rpi",
 	""

Index: ad_faad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_faad.c	30 Aug 2002 20:06:22 -0000	1.5
+++ ad_faad.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -17,7 +17,6 @@
 {
 	"AAC (MPEG2/4 Advanced Audio Coding)",
 	"faad",
-	AFM_AAC,
 	"Felix Buenemann",
 	"faad2",
 	"Under development!"

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_ffmpeg.c	14 Aug 2002 21:43:49 -0000	1.5
+++ ad_ffmpeg.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -16,7 +16,6 @@
 {
 	"FFmpeg audio decoders",
 	"ffmpeg",
-	AFM_FFMPEG,
 	"Nick Kurshev",
 	"ffmpeg.sf.net",
 	""

Index: ad_hwac3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_hwac3.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_hwac3.c	22 Apr 2002 22:34:37 -0000	1.4
+++ ad_hwac3.c	30 Aug 2002 21:44:20 -0000	1.5
@@ -20,7 +20,6 @@
 {
 	"AC3 through SPDIF",
 	"hwac3",
-	AFM_HWAC3,
 	"Nick Kurshev",
 	"???",
 	""

Index: ad_imaadpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_imaadpcm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_imaadpcm.c	3 Apr 2002 21:37:26 -0000	1.4
+++ ad_imaadpcm.c	30 Aug 2002 21:44:20 -0000	1.5
@@ -71,7 +71,6 @@
 {
 	"IMA ADPCM audio decoder",
 	"imaadpcm",
-	AFM_IMAADPCM,
 	"Nick Kurshev",
 	"Mike Melanson",
 	""

Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_liba52.c	28 Aug 2002 22:45:44 -0000	1.5
+++ ad_liba52.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -23,7 +23,6 @@
 {
 	"AC3-liba52",
 	"liba52",
-	AFM_A52,
 	"Nick Kurshev",
 	"Michel LESPINASSE",
 	""

Index: ad_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libdv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_libdv.c	5 Aug 2002 17:23:22 -0000	1.1
+++ ad_libdv.c	30 Aug 2002 21:44:20 -0000	1.2
@@ -24,7 +24,6 @@
 {
 	"Raw DV Audio Decoder",
 	"libdv",
-	AFM_LIBDV,
 	"Alexander Neundorf <neundorf at kde.org>",
 	"http://libdv.sf.net",
 	""

Index: ad_libmad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libmad.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_libmad.c	12 May 2002 00:44:32 -0000	1.2
+++ ad_libmad.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -13,7 +13,6 @@
 static ad_info_t info =  {
 	"libmad mpeg audio decoder",
 	"libmad",
-	AFM_MAD,
 	"A'rpi",
 	"libmad...",
 	"based on Xine's libmad/xine_decoder.c"

Index: ad_libvorbis.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libvorbis.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_libvorbis.c	30 Aug 2002 20:06:22 -0000	1.5
+++ ad_libvorbis.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -12,7 +12,6 @@
 {
 	"Ogg/Vorbis audio decoder",
 	"libvorbis",
-	AFM_VORBIS,
 	"Felix Buenemann, A'rpi",
 	"libvorbis",
 	"buggy"

Index: ad_mp3lib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_mp3lib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_mp3lib.c	20 May 2002 03:25:23 -0000	1.3
+++ ad_mp3lib.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -9,7 +9,6 @@
 {
 	"MPEG layer-2, layer-3",
 	"mp3lib",
-	AFM_MPEG,
 	"Nick Kurshev",
 	"mpg123",
 	"Optimized to MMX/SSE/3Dnow!"

Index: ad_msadpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_msadpcm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_msadpcm.c	29 Jun 2002 22:10:18 -0000	1.6
+++ ad_msadpcm.c	30 Aug 2002 21:44:20 -0000	1.7
@@ -19,7 +19,6 @@
 {
 	"MS ADPCM audio decoder",
 	"msadpcm",
-	AFM_MSADPCM,
 	"Nick Kurshev",
 	"Mike Melanson",
 	""

Index: ad_msgsm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_msgsm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_msgsm.c	13 Apr 2002 18:04:24 -0000	1.2
+++ ad_msgsm.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 {
 	"native MSGSM audio decoder",
 	"msgsm",
-	AFM_GSM,
 	"A'rpi",
 	"XAnim",
 	""

Index: ad_pcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_pcm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_pcm.c	30 May 2002 00:40:55 -0000	1.5
+++ ad_pcm.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -9,7 +9,6 @@
 {
 	"Uncompressed PCM audio decoder",
 	"pcm",
-	AFM_PCM,
 	"Nick Kurshev",
 	"A'rpi",
 	""

Index: ad_realaud.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ad_realaud.c	30 Aug 2002 20:06:22 -0000	1.14
+++ ad_realaud.c	30 Aug 2002 21:44:20 -0000	1.15
@@ -15,7 +15,6 @@
 static ad_info_t info =  {
 	"RealAudio decoder",
 	"realaud",
-	AFM_REAL,
 	"A'rpi",
 	"Florian Schneider",
 	"binary real audio codecs"

Index: ad_roqaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_roqaudio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_roqaudio.c	13 Apr 2002 18:04:24 -0000	1.5
+++ ad_roqaudio.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -10,7 +10,6 @@
 {
 	"Id RoQ File Audio Decoder",
 	"roqaudio",
-	AFM_ROQAUDIO,
 	"Nick Kurshev",
 	"Mike Melanson"
 	"RoQA is an internal MPlayer FOURCC"

Index: ad_sample.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_sample.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_sample.c	12 May 2002 00:44:32 -0000	1.2
+++ ad_sample.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -10,7 +10,6 @@
 static ad_info_t info =  {
 	"Sample audio decoder",  // name of the driver
 	"sample",    // driver name. should be the same as filename without ad_
-	AFM_SAMPLE,  // replace with registered AFM number
 	"A'rpi",     // writer/maintainer of _this_ file
 	"",          // writer/maintainer/site of the _codec_
 	""           // comments

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dec_audio.c	13 Aug 2002 16:04:16 -0000	1.7
+++ dec_audio.c	30 Aug 2002 21:44:20 -0000	1.8
@@ -30,12 +30,13 @@
 {
   unsigned i;
   for (i=0; mpcodecs_ad_drivers[i] != NULL; i++)
-    if(mpcodecs_ad_drivers[i]->info->id==sh_audio->codec->driver){
+//    if(mpcodecs_ad_drivers[i]->info->id==sh_audio->codec->driver){
+    if(!strcmp(mpcodecs_ad_drivers[i]->info->short_name,sh_audio->codec->drv)){
 	mpadec=mpcodecs_ad_drivers[i]; break;
     }
   if(!mpadec){
-      mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_AudioCodecFamilyNotAvailable,
-          sh_audio->codec->name, sh_audio->codec->driver);
+      mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_AudioCodecFamilyNotAvailableStr,
+          sh_audio->codec->name, sh_audio->codec->drv);
       return 0; // no such driver
   }
   
@@ -119,7 +120,7 @@
     if(sh_audio->a_in_buffer) free(sh_audio->a_in_buffer);
     sh_audio->a_in_buffer=NULL;
     if(!sh_audio->inited) return;
-    mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudio,sh_audio->codec->driver);
+    mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudioStr,sh_audio->codec->drv);
     mpadec->uninit(sh_audio);
     sh_audio->inited=0;
 }

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- dec_video.c	28 Aug 2002 21:32:31 -0000	1.146
+++ dec_video.c	30 Aug 2002 21:44:20 -0000	1.147
@@ -134,13 +134,13 @@
 
 void uninit_video(sh_video_t *sh_video){
     if(!sh_video->inited) return;
-    mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideo,sh_video->codec->driver);
+    mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv);
     mpvdec->uninit(sh_video);
     vf_uninit_filter_chain(sh_video->vfilter);
     sh_video->inited=0;
 }
 
-int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){
+int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){
     unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0;
     sh_video->codec=NULL;
     sh_video->vf_inited=0;
@@ -155,16 +155,17 @@
 	// ok we found one codec
 	if(sh_video->codec->flags&CODECS_FLAG_SELECTED) continue; // already tried & failed
 	if(codecname && strcmp(sh_video->codec->name,codecname)) continue; // -vc
-	if(vfm>=0 && sh_video->codec->driver!=vfm) continue; // vfm doesn't match
+	if(vfm && strcmp(sh_video->codec->drv,vfm)) continue; // vfm doesn't match
 	if(sh_video->codec->status<status) continue; // too unstable
 	sh_video->codec->flags|=CODECS_FLAG_SELECTED; // tagging it
 	// ok, it matches all rules, let's find the driver!
 	for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)
-	    if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break;
+//	    if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break;
+	    if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break;
 	mpvdec=mpcodecs_vd_drivers[i];
 	if(!mpvdec){ // driver not available (==compiled in)
-	    mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailable,
-		sh_video->codec->name, sh_video->codec->driver);
+	    mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailableStr,
+		sh_video->codec->name, sh_video->codec->drv);
 	    continue;
 	}
 	// it's available, let's try to init!

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dec_video.h	4 Aug 2002 02:21:50 -0000	1.8
+++ dec_video.h	30 Aug 2002 21:44:20 -0000	1.9
@@ -3,7 +3,7 @@
 extern int video_read_properties(sh_video_t *sh_video);
 
 //extern int init_video(sh_video_t *sh_video, int *pitches);
-extern int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status);
+extern int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status);
 extern void uninit_video(sh_video_t *sh_video);
 
 extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);

Index: mpc_info.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/mpc_info.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpc_info.h	25 Mar 2002 02:39:36 -0000	1.1
+++ mpc_info.h	30 Aug 2002 21:44:20 -0000	1.2
@@ -7,8 +7,6 @@
         const char *name;
         /* short name (same as driver name in codecs.conf) ("dshow") */
         const char *short_name;
-	/* codec family: -vfm id */
-	const int id;
         /* interface author/maintainer */
         const char *maintainer;
         /* codec author ("Aaron Holtzman <aholtzma at ess.engr.uvic.ca>") */

Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vd.c	28 Aug 2002 21:32:31 -0000	1.47
+++ vd.c	30 Aug 2002 21:44:20 -0000	1.48
@@ -50,7 +50,7 @@
 extern vd_functions_t mpcodecs_vd_huffyuv;
 extern vd_functions_t mpcodecs_vd_zlib;
 extern vd_functions_t mpcodecs_vd_mpegpes;
-extern vd_functions_t mpcodecs_vd_real;
+extern vd_functions_t mpcodecs_vd_realvid;
 extern vd_functions_t mpcodecs_vd_svq1;
 extern vd_functions_t mpcodecs_vd_xvid;
 extern vd_functions_t mpcodecs_vd_libdv;
@@ -100,7 +100,7 @@
 #endif
         &mpcodecs_vd_mpegpes,
 #ifdef USE_REALCODECS
-	&mpcodecs_vd_real,
+	&mpcodecs_vd_realvid,
 #endif
 	&mpcodecs_vd_svq1,
 #ifdef HAVE_XVID

Index: vd_cinepak.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_cinepak.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vd_cinepak.c	16 Mar 2002 01:10:31 -0000	1.7
+++ vd_cinepak.c	30 Aug 2002 21:44:20 -0000	1.8
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Cinepak Video decoder",
 	"cinepak",
-	VFM_CINEPAK,
 	"A'rpi",
 	"Dr. Tim Ferguson, http://www.csse.monash.edu.au/~timf/videocodec.html",
 	"native codec"

Index: vd_cyuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_cyuv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_cyuv.c	26 Mar 2002 05:03:10 -0000	1.3
+++ vd_cyuv.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Creative YUV decoder",
 	"cyuv",
-	VFM_CYUV,
 	"A'rpi",
 	"Dr. Tim Ferguson",
 	"native codec"

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_divx4.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_divx4.c	25 Jul 2002 22:18:49 -0000	1.11
+++ vd_divx4.c	30 Aug 2002 21:44:20 -0000	1.12
@@ -19,7 +19,6 @@
 	"DivX4Linux lib (divx4 mode)",
 #endif
 	"divx4",
-	VFM_DIVX4,
 	"A'rpi",
 	"http://www.divx.com",
 	"native codecs"

Index: vd_dshow.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_dshow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vd_dshow.c	25 Jul 2002 22:14:45 -0000	1.6
+++ vd_dshow.c	30 Aug 2002 21:44:20 -0000	1.7
@@ -15,7 +15,6 @@
 static vd_info_t info = {
 	"DirectShow video codecs",
 	"dshow",
-	VFM_DSHOW,
 	"A'rpi",
 	"based on http://avifile.sf.net",
 	"win32 codecs"

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vd_ffmpeg.c	28 Aug 2002 22:45:44 -0000	1.47
+++ vd_ffmpeg.c	30 Aug 2002 21:44:20 -0000	1.48
@@ -16,7 +16,6 @@
 static vd_info_t info = {
 	"FFmpeg's libavcodec codec family",
 	"ffmpeg",
-	VFM_FFMPEG,
 	"A'rpi",
 	"http://ffmpeg.sf.net",
 	"native codecs"

Index: vd_fli.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_fli.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_fli.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_fli.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Autodesk FLI/FLC Animation decoder",
 	"fli",
-	VFM_FLI,
 	"A'rpi",
 	"Mike Melanson",
 	"native codec"

Index: vd_huffyuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_huffyuv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_huffyuv.c	23 Jun 2002 01:30:47 -0000	1.3
+++ vd_huffyuv.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -28,7 +28,6 @@
 static vd_info_t info = {
 	"HuffYUV Video decoder",
 	"huffyuv",
-	VFM_HUFFYUV,
 	"Roberto Togni",
 	"Roberto Togni",
 	"native codec, original win32 by Ben Rudiak-Gould http://www.math.berkeley.edu/~benrg/huffyuv.html"

Index: vd_ijpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ijpg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vd_ijpg.c	15 May 2002 12:53:00 -0000	1.8
+++ vd_ijpg.c	30 Aug 2002 21:44:20 -0000	1.9
@@ -20,7 +20,6 @@
 static vd_info_t info = {
 	"JPEG Images decoder",
 	"ijpg",
-	VFM_IJPG,
 	"Pontscho",
 	"based on vd_mpng.c",
 	"uses Indipended JPEG Group's jpeglib"

Index: vd_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libdv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vd_libdv.c	5 Aug 2002 17:23:22 -0000	1.1
+++ vd_libdv.c	30 Aug 2002 21:44:20 -0000	1.2
@@ -24,7 +24,6 @@
 {
 	"Raw DV Video Decoder",
 	"libdv",
-	VFM_LIBDV,
 	"Alexander Neundorf <neundorf at kde.org>",
 	"http://libdv.sf.net",
 	""

Index: vd_libmpeg2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libmpeg2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vd_libmpeg2.c	18 Apr 2002 15:03:08 -0000	1.12
+++ vd_libmpeg2.c	30 Aug 2002 21:44:20 -0000	1.13
@@ -10,7 +10,6 @@
 {
 	"MPEG 1/2 Video decoder v2.0",
 	"libmpeg2",
-	VFM_MPEG,
 	"A'rpi",
 	"Aaron & Walken",
 	"native"

Index: vd_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_mpegpes.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vd_mpegpes.c	3 Apr 2002 18:22:31 -0000	1.1
+++ vd_mpegpes.c	30 Aug 2002 21:44:20 -0000	1.2
@@ -10,7 +10,6 @@
 {
 	"MPEG 1/2 Video passthrough",
 	"mpegpes",
-	VFM_MPEGPES,
 	"A'rpi",
 	"A'rpi",
 	"for hw decoders"

Index: vd_mpng.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_mpng.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_mpng.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_mpng.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -17,7 +17,6 @@
 static vd_info_t info = {
 	"PNG Images decoder",
 	"mpng",
-	VFM_MPNG,
 	"A'rpi",
 	".so, based on mpng.c",
 	"uses libpng, 8bpp modes not supported yet"

Index: vd_msrle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_msrle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_msrle.c	31 Mar 2002 15:33:32 -0000	1.3
+++ vd_msrle.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Microsoft RLE decoder",
 	"msrle",
-	VFM_MSRLE,
 	"Mike Melanson",
 	"Mike Melanson",
 	"native codec"

Index: vd_msvidc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_msvidc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_msvidc.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_msvidc.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Microsoft Video 1 / CRAM decoder",
 	"msvidc",
-	VFM_MSVIDC,
 	"A'rpi",
 	"Mike Melanson",
 	"native codec"

Index: vd_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_nuv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_nuv.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_nuv.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"NuppelVideo decoder",
 	"nuv",
-	VFM_NUV,
 	"A'rpi",
 	"Alex & Panagiotis Issaris <takis at lumumba.luc.ac.be>",
 	"native codecs"

Index: vd_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vd_odivx.c	10 Jul 2002 20:56:57 -0000	1.10
+++ vd_odivx.c	30 Aug 2002 21:44:20 -0000	1.11
@@ -21,7 +21,6 @@
 	"Opendivx 0.48 codec",
 #endif
 	"odivx",
-	VFM_ODIVX,
 	"A'rpi",
 #ifdef NEW_DECORE
 	"http://www.divx.com",

Index: vd_qtrle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtrle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_qtrle.c	12 Jul 2002 17:49:04 -0000	1.3
+++ vd_qtrle.c	30 Aug 2002 21:44:20 -0000	1.4
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Quicktime Animation (RLE) decoder",
 	"qtrle",
-	VFM_QTRLE,
 	"A'rpi",
 	"Mike Melanson",
 	"native codec"

Index: vd_qtrpza.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtrpza.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_qtrpza.c	16 Mar 2002 01:10:31 -0000	1.5
+++ vd_qtrpza.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Quicktime Apple Video",
 	"qtrpza",
-	VFM_QTRPZA,
 	"Roberto Togni",
 	"Roberto Togni",
 	"native codec"

Index: vd_qtsmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtsmc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_qtsmc.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_qtsmc.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Apple Graphics (SMC) decoder",
 	"qtsmc",
-	VFM_QTSMC,
 	"A'rpi",
 	"Mike Melanson",
 	"native codec"

Index: vd_raw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_raw.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_raw.c	7 Jul 2002 16:25:36 -0000	1.11
+++ vd_raw.c	30 Aug 2002 21:44:20 -0000	1.12
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"RAW Uncompressed Video",
 	"raw",
-	VFM_RAW,
 	"A'rpi",
 	"A'rpi & Alex",
 	"uncompressed"

Index: vd_realvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vd_realvid.c	30 Aug 2002 20:06:22 -0000	1.13
+++ vd_realvid.c	30 Aug 2002 21:44:20 -0000	1.14
@@ -14,7 +14,6 @@
 static vd_info_t info = {
 	"RealVideo decoder",
 	"realvid",
-	VFM_REAL,
 	"Florian Schneider & A'rpi",
 	"using original closed source codecs for Linux",
 	"binary real video codecs"

Index: vd_rle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_rle.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_rle.c	31 Mar 2002 10:11:49 -0000	1.5
+++ vd_rle.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"RLE Video decoder",
 	"msrle",
-	VFM_MSRLE,
 	"A'rpi",
 	"XAnim rip...",
 	"native codec"

Index: vd_roqvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_roqvideo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_roqvideo.c	16 Mar 2002 01:10:31 -0000	1.2
+++ vd_roqvideo.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"Id RoQ File Video decoder",
 	"roqvideo",
-	VFM_ROQVIDEO,
 	"A'rpi",
 	"Mike Melanson",
 	"native codec"

Index: vd_svq1.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_svq1.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_svq1.c	28 Aug 2002 22:45:44 -0000	1.5
+++ vd_svq1.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -9,7 +9,6 @@
 static vd_info_t info = {
 	"SVQ1 (Sorenson v1) Video decoder",
 	"svq1",
-	VFM_SVQ1,
 	"A'rpi",
 	"XINE team",
 	"native codec"

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_vfw.c	30 Aug 2002 20:59:21 -0000	1.11
+++ vd_vfw.c	30 Aug 2002 21:44:20 -0000	1.12
@@ -14,7 +14,6 @@
 static vd_info_t info = {
 	"Win32/VfW video codecs",
 	"vfw",
-	VFM_VFW,
 	"A'rpi",
 	"based on http://avifile.sf.net",
 	"win32 codecs"

Index: vd_vfwex.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfwex.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_vfwex.c	30 Aug 2002 20:59:21 -0000	1.2
+++ vd_vfwex.c	30 Aug 2002 21:44:20 -0000	1.3
@@ -14,7 +14,6 @@
 static vd_info_t info = {
 	"Win32/VfWex video codecs",
 	"vfwex",
-	VFM_VFWEX,
 	"A'rpi",
 	"based on http://avifile.sf.net",
 	"win32 codecs"

Index: vd_xanim.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xanim.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_xanim.c	23 Jun 2002 15:15:31 -0000	1.5
+++ vd_xanim.c	30 Aug 2002 21:44:20 -0000	1.6
@@ -11,7 +11,6 @@
 static vd_info_t info = {
 	"XAnim codecs",
 	"xanim",
-	VFM_XANIM,
 	"A'rpi & Alex",
 	"Xanim (http://xanim.va.pubnix.com/)",
 	"binary codec plugins"

Index: vd_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xvid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vd_xvid.c	5 Aug 2002 01:53:17 -0000	1.4
+++ vd_xvid.c	30 Aug 2002 21:44:20 -0000	1.5
@@ -16,7 +16,6 @@
 {
 	"xvid decoder",
 	"xvid",
-	VFM_XVID,
 	"Albeu",
 	"Albeu",
 	""

Index: vd_zlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_zlib.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vd_zlib.c	7 Jun 2002 22:43:26 -0000	1.6
+++ vd_zlib.c	30 Aug 2002 21:44:20 -0000	1.7
@@ -13,7 +13,6 @@
 static vd_info_t info = {
 	"zlib decoder (avizlib)",
 	"zlib",
-	VFM_ZLIB,
 	"Alex",
 	"based on vd_ijpg.c",
 	"uses zlib, supports only BGR24 (as AVIzlib)"


