From b0f29db5c2b8d1b7de2ccac815e33090e8c49cff Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 20 Feb 2012 00:42:33 -0800 Subject: Mark mutable static data const where appropriate. --- avprobe.c | 12 ++++++------ avserver.c | 2 +- libavcodec/aacdec.c | 2 +- libavcodec/libvpxenc.c | 2 +- libavcodec/libxvid_rc.c | 2 +- libavfilter/vf_boxblur.c | 2 +- libavfilter/vf_crop.c | 2 +- libavfilter/vf_drawtext.c | 6 +++--- libavfilter/vf_lut.c | 2 +- libavfilter/vf_overlay.c | 2 +- libavfilter/vf_pad.c | 2 +- libavfilter/vf_scale.c | 2 +- libavfilter/vf_select.c | 2 +- libavfilter/vf_setpts.c | 2 +- libavfilter/vf_settb.c | 2 +- libavfilter/vsrc_nullsrc.c | 2 +- libavformat/matroskadec.c | 2 +- libavutil/eval.c | 4 ++-- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/avprobe.c b/avprobe.c index 799b32522f..fe2b6e2860 100644 --- a/avprobe.c +++ b/avprobe.c @@ -48,13 +48,13 @@ static const OptionDef options[]; static const char *input_filename; static AVInputFormat *iformat = NULL; -static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; -static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; +static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; +static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; -static const char *unit_second_str = "s" ; -static const char *unit_hertz_str = "Hz" ; -static const char *unit_byte_str = "byte" ; -static const char *unit_bit_per_second_str = "bit/s"; +static const char unit_second_str[] = "s" ; +static const char unit_hertz_str[] = "Hz" ; +static const char unit_byte_str[] = "byte" ; +static const char unit_bit_per_second_str[] = "bit/s"; void exit_program(int ret) { diff --git a/avserver.c b/avserver.c index f3ac319ef9..4df8a3e8a4 100644 --- a/avserver.c +++ b/avserver.c @@ -1865,7 +1865,7 @@ static int http_parse_request(HTTPContext *c) static void fmt_bytecount(AVIOContext *pb, int64_t count) { - static const char *suffix = " kMGTP"; + static const char suffix[] = " kMGTP"; const char *s; for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++); diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index f9cfb764a2..dd9eefca07 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1015,7 +1015,7 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, int offset[3] = { global_gain, global_gain - 90, 0 }; int clipped_offset; int noise_flag = 1; - static const char *sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" }; + static const char *const sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" }; for (g = 0; g < ics->num_window_groups; g++) { for (i = 0; i < ics->max_sfb;) { int run_end = band_type_run_end[idx]; diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 64ff2c1eaa..bba79733ed 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -66,7 +66,7 @@ typedef struct VP8EncoderContext { } VP8Context; /** String mappings for enum vp8e_enc_control_id */ -static const char *ctlidstr[] = { +static const char *const ctlidstr[] = { [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index 2386ce3cc6..7a0e60dd09 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -47,7 +47,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){ } for(i=0; irc_context.num_entries; i++){ - static const char *frame_types = " ipbs"; + static const char frame_types[] = " ipbs"; char tmp[256]; RateControlEntry *rce; diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index a314f5c2c1..fa739de48d 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -30,7 +30,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" -static const char *var_names[] = { +static const char *const var_names[] = { "w", "h", "cw", diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index cb01bd41cb..d3b5a09060 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -32,7 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 5b794dc545..4846716fe0 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -49,7 +49,7 @@ #include FT_FREETYPE_H #include FT_GLYPH_H -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", @@ -64,8 +64,8 @@ static const char *var_names[] = { NULL }; -static const char *fun2_names[] = { - "rand", +static const char *const fun2_names[] = { + "rand" }; static double drand(void *opaque, double min, double max) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 7f3e913945..b4950f4e36 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -31,7 +31,7 @@ #include "avfilter.h" #include "internal.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 39b2375235..2115141b0e 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -33,7 +33,7 @@ #include "libavutil/mathematics.h" #include "internal.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 9ba91ed21c..fdadb1a7c7 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -35,7 +35,7 @@ #include "libavutil/mathematics.h" #include "drawutils.h" -static const char *var_names[] = { +static const char *const var_names[] = { "PI", "PHI", "E", diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 37a6f8e386..46009a7daa 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -30,7 +30,7 @@ #include "libavutil/pixdesc.h" #include "libswscale/swscale.h" -static const char *var_names[] = { +static const char *const var_names[] = { "PI", "PHI", "E", diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c index 0ec443aec5..13ec0407d5 100644 --- a/libavfilter/vf_select.c +++ b/libavfilter/vf_select.c @@ -28,7 +28,7 @@ #include "libavutil/mathematics.h" #include "avfilter.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", ///< Euler number "PHI", ///< golden ratio "PI", ///< greek pi diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c index f2650923d0..b49ca5eb57 100644 --- a/libavfilter/vf_setpts.c +++ b/libavfilter/vf_setpts.c @@ -30,7 +30,7 @@ #include "libavutil/mathematics.h" #include "avfilter.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", ///< Euler number "INTERLACED", ///< tell if the current frame is interlaced "N", ///< frame number (starting at zero) diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c index eeb4353915..49f7a57d72 100644 --- a/libavfilter/vf_settb.c +++ b/libavfilter/vf_settb.c @@ -30,7 +30,7 @@ #include "avfilter.h" #include "internal.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c index dfd56fa495..4f9dd79346 100644 --- a/libavfilter/vsrc_nullsrc.c +++ b/libavfilter/vsrc_nullsrc.c @@ -27,7 +27,7 @@ #include "libavutil/parseutils.h" #include "avfilter.h" -static const char *var_names[] = { +static const char *const var_names[] = { "E", "PHI", "PI", diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31b40a8386..4d02488b19 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -514,7 +514,7 @@ static EbmlSyntax matroska_clusters[] = { { 0 } }; -static const char *matroska_doctypes[] = { "matroska", "webm" }; +static const char *const matroska_doctypes[] = { "matroska", "webm" }; /* * Return: Whether we reached the end of a level in the hierarchy or not. diff --git a/libavutil/eval.c b/libavutil/eval.c index 9941ed7060..4d8ebf4f6e 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -543,13 +543,13 @@ int av_expr_parse_and_eval(double *d, const char *s, #undef printf #include -static double const_values[] = { +static const double const_values[] = { M_PI, M_E, 0 }; -static const char *const_names[] = { +static const char *const const_names[] = { "PI", "E", 0 -- cgit v1.2.3