[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.100,1.101 vd_xvid.c,1.11,1.12 ve_divx4.c,1.13,1.14 ve_lavc.c,1.67,1.68 ve_vfw.c,1.14,1.15 ve_xvid.c,1.24,1.25

[Alex Beregszaszi]

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

Modified Files:
	vd_ffmpeg.c vd_xvid.c ve_divx4.c ve_lavc.c ve_vfw.c ve_xvid.c 
Log Message:
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- vd_ffmpeg.c	26 Jul 2003 00:55:36 -0000	1.100
+++ vd_ffmpeg.c	13 Aug 2003 16:29:29 -0000	1.101
@@ -78,7 +78,7 @@
 //unsigned int lavc_pp=0;
 //#endif
 
-#include "cfgparser.h"
+#include "m_option.h"
 
 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
@@ -99,7 +99,7 @@
 static int lavc_param_idct_algo=0;
 static int lavc_param_debug=0;
 
-struct config lavc_decode_opts_conf[]={
+m_option_t lavc_decode_opts_conf[]={
 	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
 	{"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},

Index: vd_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xvid.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_xvid.c	2 Apr 2003 20:31:47 -0000	1.11
+++ vd_xvid.c	13 Aug 2003 16:29:29 -0000	1.12
@@ -7,7 +7,7 @@
 #ifdef HAVE_XVID
 
 #include "vd_internal.h"
-#include "cfgparser.h"
+#include "m_option.h"
 
 #include <xvid.h>
 
@@ -56,7 +56,7 @@
 
 static int do_dr2 = 0;
 
-struct config xvid_dec_opts[] = {
+m_option_t xvid_dec_opts[] = {
   { "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
   { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
   {NULL, NULL, 0, 0, 0, 0, NULL}

Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ve_divx4.c	6 Jun 2003 19:57:37 -0000	1.13
+++ ve_divx4.c	13 Aug 2003 16:29:29 -0000	1.14
@@ -68,9 +68,9 @@
 static int vbrdebug = 0;
 #endif
 
-#include "cfgparser.h"
+#include "m_option.h"
 
-struct config divx4opts_conf[]={
+m_option_t divx4opts_conf[]={
 	{"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2, NULL},
 	{"br", &divx4_param.bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
 #if ENCORE_MAJOR_VERSION < 5200

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ve_lavc.c	29 Jul 2003 02:29:37 -0000	1.67
+++ ve_lavc.c	13 Aug 2003 16:29:29 -0000	1.68
@@ -128,10 +128,10 @@
 static int lavc_param_coder= 0;
 static int lavc_param_context= 0;
 
-#include "cfgparser.h"
+#include "m_option.h"
 
 #ifdef USE_LIBAVCODEC
-struct config lavcopts_conf[]={
+m_option_t lavcopts_conf[]={
 	{"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
 	{"vratetol", &lavc_param_vrate_tolerance, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ve_vfw.c	19 Jan 2003 01:48:52 -0000	1.14
+++ ve_vfw.c	13 Aug 2003 16:29:29 -0000	1.15
@@ -29,9 +29,9 @@
 
 static char *vfw_param_codec = NULL;
 
-#include "cfgparser.h"
+#include "m_option.h"
 
-struct config vfwopts_conf[]={
+m_option_t vfwopts_conf[]={
     {"codec", &vfw_param_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };

Index: ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ve_xvid.c	6 Apr 2003 15:46:05 -0000	1.24
+++ ve_xvid.c	13 Aug 2003 16:29:29 -0000	1.25
@@ -28,7 +28,7 @@
 #include <xvid.h>
 #include "xvid_vbr.h"
 
-#include "cfgparser.h"
+#include "m_option.h"
 
 
 #ifdef XVID_API_UNSTABLE
@@ -110,7 +110,7 @@
 static uint64_t xvid_error[3];
 #endif
 
-struct config xvidencopts_conf[] = {
+m_option_t xvidencopts_conf[] = {
     { "pass", &xvidenc_pass, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
     { "me_quality", &xvidenc_quality, CONF_TYPE_INT, CONF_RANGE, 0,
       sizeof(motion_presets) / sizeof(motion_presets[0]) - 1, NULL},