RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dwt: fix about a dozen "warning: assignment from incompatible pointer type" 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-05 02:08:03 +01:00
parent 2453ca4931
commit 7e850f1cd0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/dwt.c
View File

@ -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;