doc/ffmpeg: s/avserver/ffserver/

[ffmpeg] / libavcodec / dwt.c

diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c
index 0b8f545658de3713286934afe5ff0a01d5d53adf..d9d58de8b2fcfdfeb23d1ebe5dd58342dff2e455 100644 (file)
--- a/libavcodec/dwt.c
+++ b/libavcodec/dwt.c
@@ -697,7 +697,7 @@ void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffe
     }
 }
 
-void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
+static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
     int level;
     for(level=decomposition_count-1; level>=0; level--){
         switch(type){
@@ -707,7 +707,7 @@ void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int heigh
     }
 }
 
-void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
+static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *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;
@@ -839,5 +839,5 @@ void ff_dwt_init(DWTContext *c)
     c->horizontal_compose97i = ff_snow_horizontal_compose97i;
     c->inner_add_yblock = ff_snow_inner_add_yblock;
 
-    if (ARCH_X86) ff_dwt_init_x86(c);
+    if (HAVE_MMX) ff_dwt_init_x86(c);
 }