From b8a403f124ad72b927b748f8609693accd86628f Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 2 Dec 2007 21:26:23 +0000 Subject: 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 --- cfg-common.h | 14 +++++++------- libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/vd_xvid4.c | 2 +- libmpdemux/demux_lavf.c | 2 +- libmpdemux/demux_rawaudio.c | 2 +- libmpdemux/demux_rawvideo.c | 2 +- stream/stream_cdda.c | 2 +- stream/stream_dvb.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cfg-common.h b/cfg-common.h index aae5384c4b..597deda27d 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -376,9 +376,9 @@ extern float a52_drc_level; /* defined in libmpdemux: */ extern int hr_mp3_seek; -extern m_option_t demux_rawaudio_opts[]; -extern m_option_t demux_rawvideo_opts[]; -extern m_option_t cdda_opts[]; +extern const m_option_t demux_rawaudio_opts[]; +extern const m_option_t demux_rawvideo_opts[]; +extern const m_option_t cdda_opts[]; extern char* sub_stream; extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; @@ -504,10 +504,10 @@ const m_option_t pvropts_conf[]={ #ifdef HAS_DVBIN_SUPPORT #include "stream/dvbin.h" -extern m_config_t dvbin_opts_conf[]; +extern const m_config_t dvbin_opts_conf[]; #endif -extern m_option_t lavfdopts_conf[]; +extern const m_option_t lavfdopts_conf[]; extern int rtspStreamOverTCP; extern int rtsp_transport_tcp; @@ -704,8 +704,8 @@ struct { }; #endif /* WIN32 */ -extern m_option_t lavc_decode_opts_conf[]; -extern m_option_t xvid_dec_opts[]; +extern const m_option_t lavc_decode_opts_conf[]; +extern const m_option_t xvid_dec_opts[]; int dvd_parse_chapter_range(const m_option_t*, const char*); diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 6124429036..bdbb322694 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -91,7 +91,7 @@ static char *lavc_param_skip_frame_str = NULL; static int lavc_param_threads=1; 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}, {"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_xvid4.c b/libmpcodecs/vd_xvid4.c index 70b8b6ba1d..9d9559feba 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -47,7 +47,7 @@ static int chromadeblock = 0; static int lumadering = 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}, { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL}, { "filmeffect", &filmeffect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 70d90398e2..f7f1d856c0 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -52,7 +52,7 @@ static char *opt_format; static char *opt_cryptokey; 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}, {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index 603514d5ef..8c08f73467 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -20,7 +20,7 @@ static int samplesize = 2; static int bitrate = 0; 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 }, { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL }, { "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL }, diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index 48661b0d74..28bf43022d 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -22,7 +22,7 @@ static int height = 0; static float fps = 25; static int imgsize=0; -m_option_t demux_rawvideo_opts[] = { +const m_option_t demux_rawvideo_opts[] = { // size: { "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL }, { "h", &height, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL }, diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 75f51121f1..617ff30a1a 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -73,7 +73,7 @@ static struct m_struct_st stream_opts = { }; /// 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 }, { "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 }, diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index d31d6a5d69..f62ffec332 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -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}, {"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}, -- cgit v1.2.3