Mercurial > mplayer.hg

changeset 8026:b465ba5897a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
author arpi
date Fri, 01 Nov 2002 16:40:15 +0000
parents e6cadb79f668
children b9da278e4c92
files libmpcodecs/ad.c libmpcodecs/ad_hwac3.c libmpcodecs/ad_liba52.c libmpcodecs/ad_mp3lib.c libmpcodecs/native/svq1.c libmpcodecs/vd.c libmpcodecs/vd_libmpeg2.c libmpcodecs/vd_svq1.c
diffstat 8 files changed, 27 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/ad.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/ad_hwac3.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/ad_hwac3.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/ad_liba52.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/ad_liba52.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/ad_mp3lib.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/ad_mp3lib.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/native/svq1.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/native/svq1.c	Fri Nov 01 16:40:15 2002 +0000
@@ -26,6 +26,9 @@
 #include <unistd.h>
 
 #include "../../config.h"
+
+#ifdef USE_SVQ1
+
 #include "bswap.h"
 
 /* variable length (bit) code */
@@ -793,3 +796,4 @@
   }
 }
 
+#endif
--- a/libmpcodecs/vd.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/vd.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/vd_libmpeg2.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/vd_libmpeg2.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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
--- a/libmpcodecs/vd_svq1.c	Fri Nov 01 16:39:39 2002 +0000
+++ b/libmpcodecs/vd_svq1.c	Fri Nov 01 16:40:15 2002 +0000
@@ -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