[FFmpeg-soc] [soc]: r3882 - in dirac/libavcodec: dwt.c dwt.h

[conrad]

Author: conrad
Date: Wed Dec 10 01:28:28 2008
New Revision: 3882

Log:
*_t is a POSIX reserved namespace...


Modified:
   dirac/libavcodec/dwt.c
   dirac/libavcodec/dwt.h

Modified: dirac/libavcodec/dwt.c
==============================================================================
--- dirac/libavcodec/dwt.c	(original)
+++ dirac/libavcodec/dwt.c	Wed Dec 10 01:28:28 2008
@@ -87,7 +87,7 @@ static void vertical_compose_dirac53iH0(
     }
 }
 
-static void spatial_compose_dirac53i_dy(dwt_compose_t *cs, IDWTELEM *buffer,
+static void spatial_compose_dirac53i_dy(dwt_compose *cs, IDWTELEM *buffer,
                                         int width, int height, int stride){
     int y= cs->y;
     IDWTELEM *b0= cs->b0;
@@ -134,7 +134,7 @@ static void vertical_compose_dd97iH0(IDW
     }
 }
 
-static void spatial_compose_dd97i_dy(dwt_compose_t *cs, IDWTELEM *buffer,
+static void spatial_compose_dd97i_dy(dwt_compose *cs, IDWTELEM *buffer,
                                      int width, int height, int stride){
     int y = cs->y;
     IDWTELEM *b0= cs->b0;
@@ -161,14 +161,14 @@ static void spatial_compose_dd97i_dy(dwt
     cs->y += 2;
 }
 
-static void spatial_compose53i_init(dwt_compose_t *cs, IDWTELEM *buffer,
+static void spatial_compose53i_init(dwt_compose *cs, IDWTELEM *buffer,
                                     int height, int stride){
     cs->b0 = buffer + mirror(-1-1, height-1)*stride;
     cs->b1 = buffer + mirror(-1  , height-1)*stride;
     cs->y = -1;
 }
 
-static void spatial_compose_dd97i_init(dwt_compose_t *cs, IDWTELEM *buffer,
+static void spatial_compose_dd97i_init(dwt_compose *cs, IDWTELEM *buffer,
                                        int height, int stride){
     cs->b0 = buffer + extend(-5-1, height-2)*stride;
     cs->b1 = buffer + mirror(-5  , height-1)*stride;
@@ -179,7 +179,7 @@ static void spatial_compose_dd97i_init(d
     cs->y = -5;
 }
 
-void ff_spatial_idwt_init2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height,
+void ff_spatial_idwt_init2(dwt_compose *cs, IDWTELEM *buffer, int width, int height,
                            int stride, int type, int decomposition_count){
     int level;
     for(level=decomposition_count-1; level>=0; level--){
@@ -197,7 +197,7 @@ void ff_spatial_idwt_init2(dwt_compose_t
     }
 }
 
-void ff_spatial_idwt_slice2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height,
+void ff_spatial_idwt_slice2(dwt_compose *cs, IDWTELEM *buffer, int width, int height,
                             int stride, int type, int decomposition_count, int y){
     const int support[] = {5, 3, 7, 3};
     int level;
@@ -222,7 +222,7 @@ void ff_spatial_idwt_slice2(dwt_compose_
 
 void ff_spatial_idwt2(IDWTELEM *buffer, int width, int height,
                       int stride, int type, int decomposition_count){
-    dwt_compose_t cs[decomposition_count];
+    dwt_compose cs[decomposition_count];
     int y;
 
     ff_spatial_idwt_init2(cs, buffer, width, height, stride,

Modified: dirac/libavcodec/dwt.h
==============================================================================
--- dirac/libavcodec/dwt.h	(original)
+++ dirac/libavcodec/dwt.h	Wed Dec 10 01:28:28 2008
@@ -32,7 +32,7 @@ typedef struct {
     IDWTELEM *b3;
     IDWTELEM *b4;
     IDWTELEM *b5;
-} dwt_compose_t;
+} dwt_compose;
 
 #define DWT_SNOW_DAUB9_7        0
 #define DWT_SNOW_LEGALL5_3      1
@@ -47,7 +47,7 @@ typedef struct {
 void ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride,
                       int type, int decomposition_count);
 
-void ff_spatial_idwt_slice2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height,
+void ff_spatial_idwt_slice2(dwt_compose *cs, IDWTELEM *buffer, int width, int height,
                             int stride, int type, int decomposition_count, int y);
 
 #endif /* AVCODEC_DWT_H */