diff options
| -rw-r--r-- | cfg-mencoder.h | 20 | ||||
| -rw-r--r-- | libmpcodecs/ae_faac.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ae_lame.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ae_toolame.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ae_twolame.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_nuv.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_vfw.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_xvid4.c | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index d9641955a3..6b8361260d 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -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}, diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c index 33c994757d..63c716378d 100644 --- a/libmpcodecs/ae_faac.c +++ b/libmpcodecs/ae_faac.c @@ -52,7 +52,7 @@ static unsigned long samples_input, max_bytes_output; 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", ¶m_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, {"quality", ¶m_quality, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, {"object", ¶m_object_type, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL}, diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c index 1d37d2f989..14f81409e7 100644 --- a/libmpcodecs/ae_lame.c +++ b/libmpcodecs/ae_lame.c @@ -59,7 +59,7 @@ static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_ #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}, diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c index 851fa845f9..077b83d740 100644 --- a/libmpcodecs/ae_toolame.c +++ b/libmpcodecs/ae_toolame.c @@ -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", ¶m_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, {"mode", ¶m_mode, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"psy", ¶m_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL}, diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c index e15206dee6..52e6ea8417 100644 --- a/libmpcodecs/ae_twolame.c +++ b/libmpcodecs/ae_twolame.c @@ -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", ¶m_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, {"mode", ¶m_mode, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"psy", ¶m_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL}, diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 95f9b7ee9b..49cd4ade97 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -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}, diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index caab62aabe..f288f2db7b 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -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}, diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 27c5c83d80..3ca53734c6 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -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} diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index be897dd752..fc6aa2d23b 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -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}, |