[MPlayer-cvslog] r30997 - in trunk: cfg-mencoder.h libmpcodecs/ae_faac.c libmpcodecs/ae_lame.c libmpcodecs/ae_toolame.c libmpcodecs/ae_twolame.c libmpcodecs/ve_lavc.c libmpcodecs/ve_nuv.c libmpcodecs/ve_vfw.c libmp...

diego subversion at mplayerhq.hu
Sun Apr 4 17:59:10 CEST 2010 

Author: diego
Date: Sun Apr  4 17:59:09 2010
New Revision: 30997

Log:
Mark encoder-related m_option_t struct arrays as const.

Modified:
   trunk/cfg-mencoder.h
   trunk/libmpcodecs/ae_faac.c
   trunk/libmpcodecs/ae_lame.c
   trunk/libmpcodecs/ae_toolame.c
   trunk/libmpcodecs/ae_twolame.c
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpcodecs/ve_nuv.c
   trunk/libmpcodecs/ve_vfw.c
   trunk/libmpcodecs/ve_xvid4.c

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/cfg-mencoder.h	Sun Apr  4 17:59:09 2010	(r30997)
@@ -29,16 +29,16 @@
 extern int sws_flags;
 extern char *pp_help;
 
-extern m_option_t lameopts_conf[];
-extern m_option_t lavcopts_conf[];
-extern m_option_t toolameopts_conf[];
-extern m_option_t twolameopts_conf[];
-extern m_option_t faacopts_conf[];
-extern m_option_t vfwopts_conf[];
-extern m_option_t xvidencopts_conf[];
-extern m_option_t nuvopts_conf[];
-extern m_option_t mpegopts_conf[];
-extern m_option_t lavfopts_conf[];
+extern const m_option_t faacopts_conf[];
+extern const m_option_t lameopts_conf[];
+extern const m_option_t lavcopts_conf[];
+extern const m_option_t lavfopts_conf[];
+extern const m_option_t mpegopts_conf[];
+extern const m_option_t nuvopts_conf[];
+extern const m_option_t toolameopts_conf[];
+extern const m_option_t twolameopts_conf[];
+extern const m_option_t vfwopts_conf[];
+extern const m_option_t xvidencopts_conf[];
 
 const m_option_t ovc_conf[]={
 	{"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL},

Modified: trunk/libmpcodecs/ae_faac.c
==============================================================================
--- trunk/libmpcodecs/ae_faac.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ae_faac.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -52,7 +52,7 @@ static unsigned long samples_input, max_
 static unsigned char *decoder_specific_buffer = NULL;
 static unsigned long decoder_specific_len = 0;
 
-m_option_t faacopts_conf[] = {
+const m_option_t faacopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"quality", &param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL},
 	{"object", &param_object_type, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},

Modified: trunk/libmpcodecs/ae_lame.c
==============================================================================
--- trunk/libmpcodecs/ae_lame.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ae_lame.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -59,7 +59,7 @@ static int  lame_presets_set( lame_t gfp
 #endif
 
 
-m_option_t lameopts_conf[]={
+const m_option_t lameopts_conf[] = {
 	{"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
 	{"aq", &lame_param_algqual, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
 	{"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL},

Modified: trunk/libmpcodecs/ae_toolame.c
==============================================================================
--- trunk/libmpcodecs/ae_toolame.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ae_toolame.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -43,7 +43,7 @@ static int
 static float param_vbr = 0;
 static char *param_mode = "stereo";
 
-m_option_t toolameopts_conf[] = {
+const 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, -1, 4, NULL},

Modified: trunk/libmpcodecs/ae_twolame.c
==============================================================================
--- trunk/libmpcodecs/ae_twolame.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ae_twolame.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -43,7 +43,7 @@ static int
 static float param_vbr = 0;
 static char *param_mode = "stereo";
 
-m_option_t twolameopts_conf[] = {
+const 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, -1, 4, NULL},

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ve_lavc.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -183,7 +183,7 @@ static char *lavc_param_avopt = NULL;
 
 #include "m_option.h"
 
-m_option_t lavcopts_conf[]={
+const m_option_t lavcopts_conf[]={
 	{"acodec", &lavc_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"abitrate", &lavc_param_abitrate, CONF_TYPE_INT, CONF_RANGE, 1, 1000000, NULL},
 	{"atag", &lavc_param_atag, CONF_TYPE_INT, CONF_RANGE, 0, 0xffff, NULL},

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ve_nuv.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -71,7 +71,7 @@ struct vf_priv_s nuv_priv_dflt = {
   NULL,NULL
 };
 
-m_option_t nuvopts_conf[]={
+const m_option_t nuvopts_conf[] = {
   {"raw", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 0, 1, NULL},
   {"rtjpeg", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 1, 0, NULL},
   {"lzo", &nuv_priv_dflt.lzo, CONF_TYPE_FLAG, 0, 0, 1, NULL},

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ve_vfw.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -55,7 +55,7 @@ static HRESULT CoInitRes = -1;
 
 #include "m_option.h"
 
-m_option_t vfwopts_conf[]={
+const m_option_t vfwopts_conf[]={
     {"codec", &vfw_param_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"compdata", &vfw_param_compdata, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {NULL, NULL, 0, 0, 0, 0, NULL}

Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c	Sun Apr  4 17:57:17 2010	(r30996)
+++ trunk/libmpcodecs/ve_xvid4.c	Sun Apr  4 17:59:09 2010	(r30997)
@@ -216,7 +216,7 @@ static int xvidenc_autoaspect = 0;
 
 static char *xvidenc_zones = NULL; // zones string
 
-m_option_t xvidencopts_conf[] =
+const m_option_t xvidencopts_conf[] =
 {
 	/* Standard things mencoder should be able to treat directly */
 	{"bitrate", &xvidenc_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},

More information about the MPlayer-cvslog mailing list