diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-02-20 00:42:33 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-02-21 09:47:07 -0800 |
| commit | b0f29db5c2b8d1b7de2ccac815e33090e8c49cff (patch) | |
| tree | 0d70e97046f81fcd84e8c11eec7947037e45f760 /libavcodec | |
| parent | e48a70e6da02cd5426b6340af70410bdfe27dfa7 (diff) | |
| download | ffmpeg-b0f29db5c2b8d1b7de2ccac815e33090e8c49cff.tar.gz | |
Mark mutable static data const where appropriate.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/libvpxenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/libxvid_rc.c | 2 |
3 files changed, 3 insertions, 3 deletions
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; i<s->rc_context.num_entries; i++){ - static const char *frame_types = " ipbs"; + static const char frame_types[] = " ipbs"; char tmp[256]; RateControlEntry *rce; |