From 2283b6305f9a9d0d287705348f8ee9d1333caa99 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 13 Aug 2003 16:29:32 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 4 ++-- libmpcodecs/vd_xvid.c | 4 ++-- libmpcodecs/ve_divx4.c | 4 ++-- libmpcodecs/ve_lavc.c | 4 ++-- libmpcodecs/ve_vfw.c | 4 ++-- libmpcodecs/ve_xvid.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 69c8b169b6..5ae199cde3 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -78,7 +78,7 @@ typedef struct { //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_vstats=0; 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}, diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c index a79d0f6533..a3d64337f1 100644 --- a/libmpcodecs/vd_xvid.c +++ b/libmpcodecs/vd_xvid.c @@ -7,7 +7,7 @@ #ifdef HAVE_XVID #include "vd_internal.h" -#include "cfgparser.h" +#include "m_option.h" #include @@ -56,7 +56,7 @@ typedef struct { 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} diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 945edb1cab..4640b1d672 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -68,9 +68,9 @@ static int vbrpass = -1; 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 diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 8511914e71..857b9d0a80 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -128,10 +128,10 @@ static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS; 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}, diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index c5589cb5a7..61aad0cd8f 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -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} }; diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index c0c7bb1198..2b1d801321 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -28,7 +28,7 @@ #include #include "xvid_vbr.h" -#include "cfgparser.h" +#include "m_option.h" #ifdef XVID_API_UNSTABLE @@ -110,7 +110,7 @@ static int xvidenc_psnr = 0; 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}, -- cgit v1.2.3