mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
Mark mutable static data const where appropriate.
This commit is contained in:
parent
e48a70e6da
commit
b0f29db5c2
12
avprobe.c
12
avprobe.c
@ -48,13 +48,13 @@ static const OptionDef options[];
|
|||||||
static const char *input_filename;
|
static const char *input_filename;
|
||||||
static AVInputFormat *iformat = NULL;
|
static AVInputFormat *iformat = NULL;
|
||||||
|
|
||||||
static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
|
static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
|
||||||
static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" };
|
static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" };
|
||||||
|
|
||||||
static const char *unit_second_str = "s" ;
|
static const char unit_second_str[] = "s" ;
|
||||||
static const char *unit_hertz_str = "Hz" ;
|
static const char unit_hertz_str[] = "Hz" ;
|
||||||
static const char *unit_byte_str = "byte" ;
|
static const char unit_byte_str[] = "byte" ;
|
||||||
static const char *unit_bit_per_second_str = "bit/s";
|
static const char unit_bit_per_second_str[] = "bit/s";
|
||||||
|
|
||||||
void exit_program(int ret)
|
void exit_program(int ret)
|
||||||
{
|
{
|
||||||
|
@ -1865,7 +1865,7 @@ static int http_parse_request(HTTPContext *c)
|
|||||||
|
|
||||||
static void fmt_bytecount(AVIOContext *pb, int64_t count)
|
static void fmt_bytecount(AVIOContext *pb, int64_t count)
|
||||||
{
|
{
|
||||||
static const char *suffix = " kMGTP";
|
static const char suffix[] = " kMGTP";
|
||||||
const char *s;
|
const char *s;
|
||||||
|
|
||||||
for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);
|
for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);
|
||||||
|
@ -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 offset[3] = { global_gain, global_gain - 90, 0 };
|
||||||
int clipped_offset;
|
int clipped_offset;
|
||||||
int noise_flag = 1;
|
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 (g = 0; g < ics->num_window_groups; g++) {
|
||||||
for (i = 0; i < ics->max_sfb;) {
|
for (i = 0; i < ics->max_sfb;) {
|
||||||
int run_end = band_type_run_end[idx];
|
int run_end = band_type_run_end[idx];
|
||||||
|
@ -66,7 +66,7 @@ typedef struct VP8EncoderContext {
|
|||||||
} VP8Context;
|
} VP8Context;
|
||||||
|
|
||||||
/** String mappings for enum vp8e_enc_control_id */
|
/** 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_ENTROPY] = "VP8E_UPD_ENTROPY",
|
||||||
[VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
|
[VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
|
||||||
[VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
|
[VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
|
||||||
|
@ -47,7 +47,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(i=0; i<s->rc_context.num_entries; i++){
|
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];
|
char tmp[256];
|
||||||
RateControlEntry *rce;
|
RateControlEntry *rce;
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "libavutil/pixdesc.h"
|
#include "libavutil/pixdesc.h"
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"w",
|
"w",
|
||||||
"h",
|
"h",
|
||||||
"cw",
|
"cw",
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
#include "libavutil/imgutils.h"
|
#include "libavutil/imgutils.h"
|
||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
#include FT_FREETYPE_H
|
#include FT_FREETYPE_H
|
||||||
#include FT_GLYPH_H
|
#include FT_GLYPH_H
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
@ -64,8 +64,8 @@ static const char *var_names[] = {
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *fun2_names[] = {
|
static const char *const fun2_names[] = {
|
||||||
"rand",
|
"rand"
|
||||||
};
|
};
|
||||||
|
|
||||||
static double drand(void *opaque, double min, double max)
|
static double drand(void *opaque, double min, double max)
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
#include "drawutils.h"
|
#include "drawutils.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"PI",
|
"PI",
|
||||||
"PHI",
|
"PHI",
|
||||||
"E",
|
"E",
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "libavutil/pixdesc.h"
|
#include "libavutil/pixdesc.h"
|
||||||
#include "libswscale/swscale.h"
|
#include "libswscale/swscale.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"PI",
|
"PI",
|
||||||
"PHI",
|
"PHI",
|
||||||
"E",
|
"E",
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E", ///< Euler number
|
"E", ///< Euler number
|
||||||
"PHI", ///< golden ratio
|
"PHI", ///< golden ratio
|
||||||
"PI", ///< greek pi
|
"PI", ///< greek pi
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E", ///< Euler number
|
"E", ///< Euler number
|
||||||
"INTERLACED", ///< tell if the current frame is interlaced
|
"INTERLACED", ///< tell if the current frame is interlaced
|
||||||
"N", ///< frame number (starting at zero)
|
"N", ///< frame number (starting at zero)
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "libavutil/parseutils.h"
|
#include "libavutil/parseutils.h"
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
|
|
||||||
static const char *var_names[] = {
|
static const char *const var_names[] = {
|
||||||
"E",
|
"E",
|
||||||
"PHI",
|
"PHI",
|
||||||
"PI",
|
"PI",
|
||||||
|
@ -514,7 +514,7 @@ static EbmlSyntax matroska_clusters[] = {
|
|||||||
{ 0 }
|
{ 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.
|
* Return: Whether we reached the end of a level in the hierarchy or not.
|
||||||
|
@ -543,13 +543,13 @@ int av_expr_parse_and_eval(double *d, const char *s,
|
|||||||
#undef printf
|
#undef printf
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
static double const_values[] = {
|
static const double const_values[] = {
|
||||||
M_PI,
|
M_PI,
|
||||||
M_E,
|
M_E,
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *const_names[] = {
|
static const char *const const_names[] = {
|
||||||
"PI",
|
"PI",
|
||||||
"E",
|
"E",
|
||||||
0
|
0
|
||||||
|
Loading…
Reference in New Issue
Block a user