[MPlayer-cvslog] CVS: main/libmpcodecs ae_twolame.c, 1.1, 1.2 ae_toolame.c, 1.8, 1.9

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	ae_twolame.c ae_toolame.c 
Log Message:
updated psycho model range; made a parameter file-static in ae_toolame.c

Index: ae_twolame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_twolame.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ae_twolame.c	7 May 2005 14:49:18 -0000	1.1
+++ ae_twolame.c	8 May 2005 09:37:36 -0000	1.2
@@ -27,7 +27,7 @@
 m_option_t twolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
+	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL},
 	{"vbr", &param_vbr, CONF_TYPE_FLOAT, CONF_RANGE, -50, 50, NULL},
 	{"maxvbr", &param_maxvbr, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"errprot", &param_errprot, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL},

Index: ae_toolame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_toolame.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ae_toolame.c	27 Apr 2005 19:26:09 -0000	1.8
+++ ae_toolame.c	8 May 2005 09:37:36 -0000	1.9
@@ -21,13 +21,13 @@
     param_errprot = 0,
     param_debug = 0;
     
-float param_vbr = 0;
+static float param_vbr = 0;
 static char *param_mode = "stereo";
     
 m_option_t toolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
+	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL},
 	{"vbr", &param_vbr, CONF_TYPE_FLOAT, CONF_RANGE, -50, 50, NULL},
 	{"maxvbr", &param_maxvbr, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"errprot", &param_errprot, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL},