diff options
author | Dieter <freebsd@sopwith.solgatos.com> | 2006-01-31 02:33:19 +0300 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2006-01-31 02:33:19 +0300 |
commit | ceaf1909c19431e9b089535fae32a7f8d185d802 (patch) | |
tree | 31c243ba9963b4df69d09d6f6a46acf407ca551c /libavcodec | |
parent | a851b8e898fa1d2d44660ca5708e3da76107f179 (diff) |
add static keyword to some functions
patch by Dieter <freebsd at sopwith solgatos com>
Originally committed as revision 4913 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dvdsub.c | 4 | ||||
-rw-r--r-- | libavcodec/snow.c | 12 | ||||
-rw-r--r-- | libavcodec/utils.c | 4 | ||||
-rw-r--r-- | libavcodec/vc9.c | 12 | ||||
-rw-r--r-- | libavcodec/vorbis.c | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/dvdsub.c b/libavcodec/dvdsub.c index bf05c1a8c8..7a07587133 100644 --- a/libavcodec/dvdsub.c +++ b/libavcodec/dvdsub.c @@ -28,12 +28,12 @@ static int dvdsub_init_decoder(AVCodecContext *avctx) return 0; } -uint16_t getbe16(const uint8_t *p) +static uint16_t getbe16(const uint8_t *p) { return (p[0] << 8) | p[1]; } -int get_nibble(const uint8_t *buf, int nibble_offset) +static int get_nibble(const uint8_t *buf, int nibble_offset) { return (buf[nibble_offset >> 1] >> ((1 - (nibble_offset & 1)) << 2)) & 0xf; } diff --git a/libavcodec/snow.c b/libavcodec/snow.c index d9f58e2d02..1edd387d67 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -1576,7 +1576,7 @@ static void spatial_compose97i(DWTELEM *buffer, int width, int height, int strid spatial_compose97i_dy(&cs, buffer, width, height, stride); } -void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){ +static void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){ int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ @@ -1589,7 +1589,7 @@ void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int wid } } -void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ +static void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ @@ -1601,7 +1601,7 @@ void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int hei } } -void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){ +static void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){ const int support = type==1 ? 3 : 5; int level; if(type==2) return; @@ -1619,7 +1619,7 @@ void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int he } } -void ff_spatial_idwt_buffered_slice(dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){ +static void ff_spatial_idwt_buffered_slice(dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){ const int support = type==1 ? 3 : 5; int level; if(type==2) return; @@ -1637,7 +1637,7 @@ void ff_spatial_idwt_buffered_slice(dwt_compose_t *cs, slice_buffer * slice_buf, } } -void ff_spatial_idwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ +static void ff_spatial_idwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ if(type==2){ int level; for(level=decomposition_count-1; level>=0; level--) @@ -3776,7 +3776,7 @@ static int decode_header(SnowContext *s){ return 0; } -static void init_qexp(){ +static void init_qexp(void){ int i; double v=128; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3e450cbeff..04d5081c7d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -149,9 +149,9 @@ void av_free_static(void) * Call av_free_static automatically before it's too late */ -static void do_free() __attribute__ ((destructor)); +static void do_free(void) __attribute__ ((destructor)); -static void do_free() +static void do_free(void) { av_free_static(); } diff --git a/libavcodec/vc9.c b/libavcodec/vc9.c index ea0ebae0b7..465edda103 100644 --- a/libavcodec/vc9.c +++ b/libavcodec/vc9.c @@ -929,7 +929,7 @@ static int advanced_entry_point_process(AVCodecContext *avctx, GetBitContext *gb * @todo TODO: Take into account stride * @todo TODO: Allow use of external buffers ? */ -int alloc_bitplane(BitPlane *bp, int width, int height) +static int alloc_bitplane(BitPlane *bp, int width, int height) { if (!bp || bp->width<0 || bp->height<0) return -1; bp->data = (uint8_t*)av_malloc(width*height); @@ -942,7 +942,7 @@ int alloc_bitplane(BitPlane *bp, int width, int height) /** Free the bitplane's buffer * @param bp Bitplane which buffer is to free */ -void free_bitplane(BitPlane *bp) +static void free_bitplane(BitPlane *bp) { bp->width = bp->stride = bp->height = 0; if (bp->data) av_freep(&bp->data); @@ -1832,7 +1832,7 @@ static inline int vc9_pred_dc(MpegEncContext *s, int n, * @todo TODO: Process the blocks * @todo TODO: Use M$ MPEG-4 cbp prediction */ -int vc9_decode_block(VC9Context *v, DCTELEM block[64], int n, int coded, int mquant) +static int vc9_decode_block(VC9Context *v, DCTELEM block[64], int n, int coded, int mquant) { GetBitContext *gb = &v->s.gb; MpegEncContext *s = &v->s; @@ -1979,7 +1979,7 @@ static inline int vc9_coded_block_pred(MpegEncContext * s, int n, uint8_t **code /** Decode one I-frame MB (in Simple/Main profile) * @todo TODO: Extend to AP */ -int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64]) { int i, cbp, val; uint8_t *coded_val; @@ -2013,7 +2013,7 @@ int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64]) * @todo TODO: Extend to AP * @fixme FIXME: DC value for inter blocks not set */ -int vc9_decode_p_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_p_mb(VC9Context *v, DCTELEM block[6][64]) { MpegEncContext *s = &v->s; GetBitContext *gb = &s->gb; @@ -2160,7 +2160,7 @@ int vc9_decode_p_mb(VC9Context *v, DCTELEM block[6][64]) * @warning XXX: Used for decoding BI MBs * @fixme FIXME: DC value for inter blocks not set */ -int vc9_decode_b_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_b_mb(VC9Context *v, DCTELEM block[6][64]) { MpegEncContext *s = &v->s; GetBitContext *gb = &v->s.gb; diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 72b58ad78b..01f1301e51 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -46,7 +46,7 @@ /** * reads 0-32 bits when using the ALT_BITSTREAM_READER_LE bitstream reader */ -unsigned int get_bits_long_le(GetBitContext *s, int n){ +static unsigned int get_bits_long_le(GetBitContext *s, int n){ if(n<=17) return get_bits(s, n); else{ int ret= get_bits(s, 16); |