From efce1a8fea2d7fb3272992042b9d56f58deb9834 Mon Sep 17 00:00:00 2001 From: Dieter Date: Mon, 30 Jan 2006 23:41:27 +0000 Subject: [PATCH] add static keyword to some functions patch by Dieter Originally committed as revision 4914 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/qdm2.c | 14 +++++++------- vhook/drawtext.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index e0674beda7..98bec5cca4 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -230,7 +230,7 @@ static float noise_samples[128]; static MPA_INT mpa_window[512] __attribute__((aligned(16))); -static void softclip_table_init() { +static void softclip_table_init(void) { int i; double dfl = SOFTCLIP_THRESHOLD - 32767; float delta = 1.0 / -dfl; @@ -240,7 +240,7 @@ static void softclip_table_init() { // random generated table -static void rnd_table_init() { +static void rnd_table_init(void) { int i,j; uint32_t ldw,hdw; uint64_t tmp64_1; @@ -276,7 +276,7 @@ static void rnd_table_init() { } -static void init_noise_samples() { +static void init_noise_samples(void) { int i; int random_seed = 0; float delta = 1.0 / 16384.0; @@ -287,7 +287,7 @@ static void init_noise_samples() { } -static void qdm2_init_vlc() +static void qdm2_init_vlc(void) { init_vlc (&vlc_tab_level, 8, 24, vlc_tab_level_huffbits, 1, 1, @@ -525,7 +525,7 @@ static void build_sb_samples_from_noise (QDM2Context *q, int sb) * @param channels number of channels * @param coding_method q->coding_method[0][0][0] */ - void fix_coding_method_array (int sb, int channels, sb_int8_array coding_method) +static void fix_coding_method_array (int sb, int channels, sb_int8_array coding_method) { int j,k; int ch; @@ -1690,7 +1690,7 @@ static void qdm2_synthesis_filter (QDM2Context *q, int index) * * @param q context */ -void qdm2_init(QDM2Context *q) { +static void qdm2_init(QDM2Context *q) { static int inited = 0; if (inited != 0) @@ -1942,7 +1942,7 @@ static int qdm2_decode_close(AVCodecContext *avctx) } -void qdm2_decode (QDM2Context *q, uint8_t *in, int16_t *out) +static void qdm2_decode (QDM2Context *q, uint8_t *in, int16_t *out) { int ch, i; const int frame_size = (q->frame_size * q->channels); diff --git a/vhook/drawtext.c b/vhook/drawtext.c index a18d358cb2..a218cc5551 100644 --- a/vhook/drawtext.c +++ b/vhook/drawtext.c @@ -116,7 +116,7 @@ void Release(void *ctx) } -int ParseColor(char *text, unsigned char yuv_color[3]) +static int ParseColor(char *text, unsigned char yuv_color[3]) { char tmp[3]; unsigned char rgb_color[3]; @@ -300,7 +300,7 @@ int Configure(void **ctxp, int argc, char *argv[]) -inline void draw_glyph(AVPicture *picture, FT_Bitmap *bitmap, unsigned int x, unsigned int y, unsigned int width, unsigned int height, unsigned char yuv_fgcolor[3], unsigned char yuv_bgcolor[3], int outline) +static inline void draw_glyph(AVPicture *picture, FT_Bitmap *bitmap, unsigned int x, unsigned int y, unsigned int width, unsigned int height, unsigned char yuv_fgcolor[3], unsigned char yuv_bgcolor[3], int outline) { int r, c; int spixel, dpixel[3], in_glyph=0; @@ -363,7 +363,7 @@ inline void draw_glyph(AVPicture *picture, FT_Bitmap *bitmap, unsigned int x, un } -inline void draw_box(AVPicture *picture, unsigned int x, unsigned int y, unsigned int width, unsigned int height, unsigned char yuv_color[3]) +static inline void draw_box(AVPicture *picture, unsigned int x, unsigned int y, unsigned int width, unsigned int height, unsigned char yuv_color[3]) { int i, j;