wmalossless: Switch to new audio API

[ffmpeg] / libavcodec / dwt.c

diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c
index c27961084e8cffb15d779b6e2173fe146e1085a0..4b9cfd4ecc0f7f4d07cd313918d8166f2c202e5e 100644 (file)
--- a/libavcodec/dwt.c
+++ b/libavcodec/dwt.c
@@ -1077,8 +1077,8 @@ static void vertical_compose_daub97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
 
 static void spatial_compose_dd97i_dy(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0;
-    vertical_compose_5tap vertical_compose_h0 = d->vertical_compose_h0;
+    vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0;
+    vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0;
     DWTCompose *cs = d->cs + level;
 
     int i, y = cs->y;
@@ -1101,8 +1101,8 @@ static void spatial_compose_dd97i_dy(DWTContext *d, int level, int width, int he
 
 static void spatial_compose_dirac53i_dy(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0;
-    vertical_compose_3tap vertical_compose_h0 = d->vertical_compose_h0;
+    vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0;
+    vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0;
     DWTCompose *cs = d->cs + level;
 
     int y= cs->y;
@@ -1124,8 +1124,8 @@ static void spatial_compose_dirac53i_dy(DWTContext *d, int level, int width, int
 
 static void spatial_compose_dd137i_dy(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_5tap vertical_compose_l0 = d->vertical_compose_l0;
-    vertical_compose_5tap vertical_compose_h0 = d->vertical_compose_h0;
+    vertical_compose_5tap vertical_compose_l0 = (void*)d->vertical_compose_l0;
+    vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0;
     DWTCompose *cs = d->cs + level;
 
     int i, y = cs->y;
@@ -1149,7 +1149,7 @@ static void spatial_compose_dd137i_dy(DWTContext *d, int level, int width, int h
 // haar makes the assumption that height is even (always true for dirac)
 static void spatial_compose_haari_dy(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_2tap vertical_compose = d->vertical_compose;
+    vertical_compose_2tap vertical_compose = (void*)d->vertical_compose;
     int y = d->cs[level].y;
     IDWTELEM *b0 = d->buffer + (y-1)*stride;
     IDWTELEM *b1 = d->buffer + (y  )*stride;
@@ -1165,8 +1165,8 @@ static void spatial_compose_haari_dy(DWTContext *d, int level, int width, int he
 // Fortunately, this filter isn't used in practice.
 static void spatial_compose_fidelity(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_9tap vertical_compose_l0 = d->vertical_compose_l0;
-    vertical_compose_9tap vertical_compose_h0 = d->vertical_compose_h0;
+    vertical_compose_9tap vertical_compose_l0 = (void*)d->vertical_compose_l0;
+    vertical_compose_9tap vertical_compose_h0 = (void*)d->vertical_compose_h0;
     int i, y;
     IDWTELEM *b[8];
 
@@ -1190,10 +1190,10 @@ static void spatial_compose_fidelity(DWTContext *d, int level, int width, int he
 
 static void spatial_compose_daub97i_dy(DWTContext *d, int level, int width, int height, int stride)
 {
-    vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0;
-    vertical_compose_3tap vertical_compose_h0 = d->vertical_compose_h0;
-    vertical_compose_3tap vertical_compose_l1 = d->vertical_compose_l1;
-    vertical_compose_3tap vertical_compose_h1 = d->vertical_compose_h1;
+    vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0;
+    vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0;
+    vertical_compose_3tap vertical_compose_l1 = (void*)d->vertical_compose_l1;
+    vertical_compose_3tap vertical_compose_h1 = (void*)d->vertical_compose_h1;
     DWTCompose *cs = d->cs + level;
 
     int i, y = cs->y;
@@ -1300,29 +1300,29 @@ int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height
     switch (type) {
     case DWT_DIRAC_DD9_7:
         d->spatial_compose = spatial_compose_dd97i_dy;
-        d->vertical_compose_l0 = vertical_compose53iL0;
-        d->vertical_compose_h0 = vertical_compose_dd97iH0;
+        d->vertical_compose_l0 = (void*)vertical_compose53iL0;
+        d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0;
         d->horizontal_compose = horizontal_compose_dd97i;
         d->support = 7;
         break;
     case DWT_DIRAC_LEGALL5_3:
         d->spatial_compose = spatial_compose_dirac53i_dy;
-        d->vertical_compose_l0 = vertical_compose53iL0;
-        d->vertical_compose_h0 = vertical_compose_dirac53iH0;
+        d->vertical_compose_l0 = (void*)vertical_compose53iL0;
+        d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0;
         d->horizontal_compose = horizontal_compose_dirac53i;
         d->support = 3;
         break;
     case DWT_DIRAC_DD13_7:
         d->spatial_compose = spatial_compose_dd137i_dy;
-        d->vertical_compose_l0 = vertical_compose_dd137iL0;
-        d->vertical_compose_h0 = vertical_compose_dd97iH0;
+        d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0;
+        d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0;
         d->horizontal_compose = horizontal_compose_dd137i;
         d->support = 7;
         break;
     case DWT_DIRAC_HAAR0:
     case DWT_DIRAC_HAAR1:
         d->spatial_compose = spatial_compose_haari_dy;
-        d->vertical_compose = vertical_compose_haar;
+        d->vertical_compose = (void*)vertical_compose_haar;
         if (type == DWT_DIRAC_HAAR0)
             d->horizontal_compose = horizontal_compose_haar0i;
         else
@@ -1331,16 +1331,16 @@ int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height
         break;
     case DWT_DIRAC_FIDELITY:
         d->spatial_compose = spatial_compose_fidelity;
-        d->vertical_compose_l0 = vertical_compose_fidelityiL0;
-        d->vertical_compose_h0 = vertical_compose_fidelityiH0;
+        d->vertical_compose_l0 = (void*)vertical_compose_fidelityiL0;
+        d->vertical_compose_h0 = (void*)vertical_compose_fidelityiH0;
         d->horizontal_compose = horizontal_compose_fidelityi;
         break;
     case DWT_DIRAC_DAUB9_7:
         d->spatial_compose = spatial_compose_daub97i_dy;
-        d->vertical_compose_l0 = vertical_compose_daub97iL0;
-        d->vertical_compose_h0 = vertical_compose_daub97iH0;
-        d->vertical_compose_l1 = vertical_compose_daub97iL1;
-        d->vertical_compose_h1 = vertical_compose_daub97iH1;
+        d->vertical_compose_l0 = (void*)vertical_compose_daub97iL0;
+        d->vertical_compose_h0 = (void*)vertical_compose_daub97iH0;
+        d->vertical_compose_l1 = (void*)vertical_compose_daub97iL1;
+        d->vertical_compose_h1 = (void*)vertical_compose_daub97iH1;
         d->horizontal_compose = horizontal_compose_daub97i;
         d->support = 5;
         break;