[Mplayer-cvslog] CVS: main cfg-common.h,1.26,1.27 mencoder.c,1.60,1.61

[Kim Minh Kaplan CVS]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv23621

Modified Files:
	cfg-common.h mencoder.c 
Log Message:
Extended DVD chapter specification.  Remove -last-chapter option.


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cfg-common.h	21 Jan 2002 22:11:03 -0000	1.26
+++ cfg-common.h	24 Jan 2002 23:02:59 -0000	1.27
@@ -16,8 +16,7 @@
 	{"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
 	{"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
 	{"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
-	{"chapter", &dvd_chapter, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
-	{"last-chapter", &dvd_last_chapter, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
+	{"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
 #else
 	{"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mencoder.c	17 Jan 2002 01:02:41 -0000	1.60
+++ mencoder.c	24 Jan 2002 23:02:59 -0000	1.61
@@ -27,6 +27,7 @@
 #include "cpudetect.h"
 
 #include "codec-cfg.h"
+#include "cfgparser.h"
 
 #include "stream.h"
 #include "demuxer.h"
@@ -170,8 +171,6 @@
 static int scale_srcH=0;
 static int vo_w=0, vo_h=0;
 //-------------------------- config stuff:
-
-#include "cfgparser.h"
 
 m_config_t* mconfig;