[Mplayer-cvslog] CVS: main/libmpcodecs ad.c,1.11,1.12 ad_hwac3.c,1.7,1.8 ad_liba52.c,1.7,1.8 ad_mp3lib.c,1.4,1.5 vd.c,1.60,1.61 vd_libmpeg2.c,1.16,1.17 vd_svq1.c,1.6,1.7

[Arpi of Ize]

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

Modified Files:
	ad.c ad_hwac3.c ad_liba52.c ad_mp3lib.c vd.c vd_libmpeg2.c 
	vd_svq1.c 
Log Message:
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled


Index: ad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ad.c	31 Oct 2002 23:11:34 -0000	1.11
+++ ad.c	1 Nov 2002 16:40:07 -0000	1.12
@@ -41,9 +41,13 @@
 ad_functions_t* mpcodecs_ad_drivers[] =
 {
 //  &mpcodecs_ad_null,
+#ifdef USE_MP3LIB
   &mpcodecs_ad_mp3lib,
+#endif
+#ifdef USE_LIBA52
   &mpcodecs_ad_liba52,
   &mpcodecs_ad_hwac3,
+#endif
 #ifdef USE_LIBAVCODEC
   &mpcodecs_ad_ffmpeg,
 #endif

Index: ad_hwac3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_hwac3.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_hwac3.c	15 Sep 2002 15:50:28 -0000	1.7
+++ ad_hwac3.c	1 Nov 2002 16:40:07 -0000	1.8
@@ -7,6 +7,8 @@
 #include <unistd.h>
 
 #include "config.h"
+#ifdef USE_LIBA52
+
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -102,3 +104,4 @@
 
 	return 6144;
 }
+#endif

Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_liba52.c	31 Aug 2002 13:09:23 -0000	1.7
+++ ad_liba52.c	1 Nov 2002 16:40:07 -0000	1.8
@@ -3,6 +3,8 @@
 #include <unistd.h>
 
 #include "config.h"
+#ifdef USE_LIBA52
+
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -189,3 +191,4 @@
 	}
   return len;
 }
+#endif

Index: ad_mp3lib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_mp3lib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_mp3lib.c	30 Aug 2002 21:44:20 -0000	1.4
+++ ad_mp3lib.c	1 Nov 2002 16:40:07 -0000	1.5
@@ -3,6 +3,8 @@
 #include <unistd.h>
 
 #include "config.h"
+#ifdef USE_MP3LIB
+
 #include "ad_internal.h"
 
 static ad_info_t info = 
@@ -77,3 +79,4 @@
 {
    return MP3_DecodeFrame(buf,-1);
 }
+#endif

Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vd.c	30 Oct 2002 17:45:44 -0000	1.60
+++ vd.c	1 Nov 2002 16:40:07 -0000	1.61
@@ -97,13 +97,17 @@
 	&mpcodecs_vd_ijpg,
 #endif
 	&mpcodecs_vd_mtga,
+#ifdef USE_LIBMPEG2
         &mpcodecs_vd_libmpeg2,
+#endif
         &mpcodecs_vd_huffyuv,
         &mpcodecs_vd_mpegpes,
 #ifdef USE_REALCODECS
 	&mpcodecs_vd_realvid,
 #endif
+#ifdef USE_SVQ1
 	&mpcodecs_vd_svq1,
+#endif
 #ifdef HAVE_XVID
 	&mpcodecs_vd_xvid,
 #endif

Index: vd_libmpeg2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libmpeg2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vd_libmpeg2.c	29 Oct 2002 11:26:26 -0000	1.16
+++ vd_libmpeg2.c	1 Nov 2002 16:40:07 -0000	1.17
@@ -2,6 +2,8 @@
 #include <stdlib.h>
 
 #include "config.h"
+#ifdef USE_LIBMPEG2
+
 #include "mp_msg.h"
 
 #include "vd_internal.h"
@@ -303,3 +305,4 @@
 
     return mpi;
 }
+#endif

Index: vd_svq1.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_svq1.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vd_svq1.c	30 Aug 2002 21:44:20 -0000	1.6
+++ vd_svq1.c	1 Nov 2002 16:40:07 -0000	1.7
@@ -2,6 +2,8 @@
 #include <stdlib.h>
 
 #include "config.h"
+#ifdef USE_SVQ1
+
 #include "mp_msg.h"
 
 #include "vd_internal.h"
@@ -85,3 +87,4 @@
     return mpi;
 }
 
+#endif