[MPlayer-cvslog] CVS: main/libmpcodecs ae_lame.c,1.3,1.4

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv2683/libmpcodecs

Modified Files:
	ae_lame.c 
Log Message:
replace mp3lame version detection by required features detection

Index: ae_lame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_lame.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ae_lame.c	22 Apr 2005 17:53:31 -0000	1.3
+++ ae_lame.c	18 Oct 2005 21:40:17 -0000	1.4
@@ -32,7 +32,7 @@
 static int lame_param_br_min = 0; //not specified
 static int lame_param_br_max = 0; //not specified
 
-#if HAVE_MP3LAME >= 392
+#ifdef HAVE_MP3LAME_PRESET
 int lame_param_fast=0; // unset
 static char* lame_param_preset=NULL; // unset
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name );
@@ -57,7 +57,7 @@
 	{"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
 	{"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
-#if HAVE_MP3LAME >= 392
+#ifdef HAVE_MP3LAME_PRESET
 	{"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
@@ -181,7 +181,7 @@
     }
     if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq);
     if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq);
-#if HAVE_MP3LAME >= 392
+#ifdef HAVE_MP3LAME_PRESET
     if(lame_param_preset != NULL) {
         mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_LamePresetEquals,lame_param_preset);
         if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0)
@@ -205,7 +205,7 @@
     return 1;
 }
 
-#if HAVE_MP3LAME >= 392
+#ifdef HAVE_MP3LAME_PRESET
 /* lame_presets_set 
    taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name )
@@ -256,7 +256,7 @@
         preset_name = "256";
     }
 
-#if HAVE_MP3LAME >= 393
+#ifdef HAVE_MP3LAME_PRESET_MEDIUM
     if (strcmp(preset_name, "medium") == 0) {
         if (fast > 0)
            lame_set_preset(gfp, MEDIUM_FAST);
@@ -321,7 +321,7 @@
 }
 #endif
 
-#if HAVE_MP3LAME >= 392
+#ifdef HAVE_MP3LAME_PRESET
 /* lame_presets_longinfo_dm
    taken out of presets_longinfo_dm in lame-3.93.1/frontend/parse.c and modified */
 static void  lame_presets_longinfo_dm ( FILE* msgfp )