# HG changeset patch
# User mru
# Date 1138663999 0
# Node ID 961af1358c7f682b012f280d957b31511b6772f5
# Parent  d89dcf01cae2e87acf73c888924ed699cc9de79d
add static keyword to some functions
patch by Dieter <freebsd at sopwith solgatos com>

diff -r d89dcf01cae2 -r 961af1358c7f dvdsub.c
--- a/dvdsub.c	Mon Jan 30 22:59:09 2006 +0000
+++ b/dvdsub.c	Mon Jan 30 23:33:19 2006 +0000
@@ -28,12 +28,12 @@
     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 -r d89dcf01cae2 -r 961af1358c7f snow.c
--- a/snow.c	Mon Jan 30 22:59:09 2006 +0000
+++ b/snow.c	Mon Jan 30 23:33:19 2006 +0000
@@ -1576,7 +1576,7 @@
         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_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_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_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(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 @@
     return 0;
 }
 
-static void init_qexp(){
+static void init_qexp(void){
     int i;
     double v=128;
 
diff -r d89dcf01cae2 -r 961af1358c7f utils.c
--- a/utils.c	Mon Jan 30 22:59:09 2006 +0000
+++ b/utils.c	Mon Jan 30 23:33:19 2006 +0000
@@ -149,9 +149,9 @@
  * 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 -r d89dcf01cae2 -r 961af1358c7f vc9.c
--- a/vc9.c	Mon Jan 30 22:59:09 2006 +0000
+++ b/vc9.c	Mon Jan 30 23:33:19 2006 +0000
@@ -929,7 +929,7 @@
  * @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 @@
 /** 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 @@
  * @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 @@
 /** 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 @@
  * @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 @@
  * @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 -r d89dcf01cae2 -r 961af1358c7f vorbis.c
--- a/vorbis.c	Mon Jan 30 22:59:09 2006 +0000
+++ b/vorbis.c	Mon Jan 30 23:33:19 2006 +0000
@@ -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);