RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Make m_option_t arrays referenced by cfg-common.h const 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25269 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-12-02 21:26:23 +00:00
parent 1f8007f0fd
commit b8a403f124
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cfg-common.h
View File

@ -376,9 +376,9 @@ extern float a52_drc_level;
/* defined in libmpdemux: */ /* defined in libmpdemux: */
extern int hr_mp3_seek; extern int hr_mp3_seek;
extern m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawaudio_opts[];
extern m_option_t demux_rawvideo_opts[]; extern const m_option_t demux_rawvideo_opts[];
extern m_option_t cdda_opts[]; extern const m_option_t cdda_opts[];
extern char* sub_stream; extern char* sub_stream;
extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; extern int demuxer_type, audio_demuxer_type, sub_demuxer_type;
@ -504,10 +504,10 @@ const m_option_t pvropts_conf[]={
#ifdef HAS_DVBIN_SUPPORT #ifdef HAS_DVBIN_SUPPORT
#include "stream/dvbin.h" #include "stream/dvbin.h"
extern m_config_t dvbin_opts_conf[]; extern const m_config_t dvbin_opts_conf[];
#endif #endif
extern m_option_t lavfdopts_conf[]; extern const m_option_t lavfdopts_conf[];
extern int rtspStreamOverTCP; extern int rtspStreamOverTCP;
extern int rtsp_transport_tcp; extern int rtsp_transport_tcp;
@ -704,8 +704,8 @@ struct {
}; };
#endif /* WIN32 */ #endif /* WIN32 */
extern m_option_t lavc_decode_opts_conf[]; extern const m_option_t lavc_decode_opts_conf[];
extern m_option_t xvid_dec_opts[]; extern const m_option_t xvid_dec_opts[];
int dvd_parse_chapter_range(const m_option_t*, const char*); int dvd_parse_chapter_range(const m_option_t*, const char*);

2
libmpcodecs/vd_ffmpeg.c
View File

@ -91,7 +91,7 @@ static char *lavc_param_skip_frame_str = NULL;
static int lavc_param_threads=1; static int lavc_param_threads=1;
static int lavc_param_bitexact=0; static int lavc_param_bitexact=0;
m_option_t lavc_decode_opts_conf[]={ const m_option_t lavc_decode_opts_conf[]={
{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, {"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}, {"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}, {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},

2
libmpcodecs/vd_xvid4.c
View File

@ -47,7 +47,7 @@ static int chromadeblock = 0;
static int lumadering = 0; static int lumadering = 0;
static int chromadering = 0; static int chromadering = 0;
m_option_t xvid_dec_opts[] = { const m_option_t xvid_dec_opts[] = {
{ "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{ "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL}, { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{ "filmeffect", &filmeffect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "filmeffect", &filmeffect, CONF_TYPE_FLAG, 0, 0, 1, NULL},

2
libmpdemux/demux_lavf.c
View File

@ -52,7 +52,7 @@ static char *opt_format;
static char *opt_cryptokey; static char *opt_cryptokey;
extern int ts_prog; extern int ts_prog;
m_option_t lavfdopts_conf[] = { const m_option_t lavfdopts_conf[] = {
{"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL}, {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL},
{"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
{"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},

2
libmpdemux/demux_rawaudio.c
View File

@ -20,7 +20,7 @@ static int samplesize = 2;
static int bitrate = 0; static int bitrate = 0;
static int format = 0x1; // Raw PCM static int format = 0x1; // Raw PCM
m_option_t demux_rawaudio_opts[] = { const m_option_t demux_rawaudio_opts[] = {
{ "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL }, { "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL }, { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
{ "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL }, { "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },

2
libmpdemux/demux_rawvideo.c
View File

@ -22,7 +22,7 @@ static int height = 0;
static float fps = 25; static float fps = 25;
static int imgsize=0; static int imgsize=0;
m_option_t demux_rawvideo_opts[] = { const m_option_t demux_rawvideo_opts[] = {
// size: // size:
{ "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL }, { "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },
{ "h", &height, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL }, { "h", &height, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },

2
stream/stream_cdda.c
View File

@ -73,7 +73,7 @@ static struct m_struct_st stream_opts = {
}; };
/// We keep these options but now they set the defaults /// We keep these options but now they set the defaults
m_option_t cdda_opts[] = { const m_option_t cdda_opts[] = {
{ "speed", &cdda_dflts.speed, CONF_TYPE_INT, M_OPT_RANGE,1,100, NULL }, { "speed", &cdda_dflts.speed, CONF_TYPE_INT, M_OPT_RANGE,1,100, NULL },
{ "paranoia", &cdda_dflts.paranoia_mode, CONF_TYPE_INT,M_OPT_RANGE, 0, 2, NULL }, { "paranoia", &cdda_dflts.paranoia_mode, CONF_TYPE_INT,M_OPT_RANGE, 0, 2, NULL },
{ "generic-dev", &cdda_dflts.generic_dev, CONF_TYPE_STRING, 0, 0, 0, NULL }, { "generic-dev", &cdda_dflts.generic_dev, CONF_TYPE_STRING, 0, 0, 0, NULL },

2
stream/stream_dvb.c
View File

@ -98,7 +98,7 @@ static struct m_struct_st stream_opts = {
m_option_t dvbin_opts_conf[] = { const m_option_t dvbin_opts_conf[] = {
{"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
{"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
{"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL}, {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL},