diff options
| author | jamal <jamrial@gmail.com> | 2012-07-27 05:23:17 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 19:36:17 +0200 |
| commit | 52a62f908508f784718897f651954b87bddd2626 (patch) | |
| tree | 6fc2a26d43363993e49bc12266d560c415e45012 | |
| parent | b3841db133979721972807f67000789b8b3fa015 (diff) | |
| download | ffmpeg-52a62f908508f784718897f651954b87bddd2626.tar.gz | |
dwt: Fix several warnings about incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dwt.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c index 1eb8221aa8..7ef9e2414e 100644 --- a/libavcodec/x86/dwt.c +++ b/libavcodec/x86/dwt.c @@ -142,23 +142,23 @@ void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) switch (type) { case DWT_DIRAC_DD9_7: - d->vertical_compose_l0 = vertical_compose53iL0_mmx; - d->vertical_compose_h0 = vertical_compose_dd97iH0_mmx; + d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; break; case DWT_DIRAC_LEGALL5_3: - d->vertical_compose_l0 = vertical_compose53iL0_mmx; - d->vertical_compose_h0 = vertical_compose_dirac53iH0_mmx; + d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_mmx; break; case DWT_DIRAC_DD13_7: - d->vertical_compose_l0 = vertical_compose_dd137iL0_mmx; - d->vertical_compose_h0 = vertical_compose_dd97iH0_mmx; + d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; break; case DWT_DIRAC_HAAR0: - d->vertical_compose = vertical_compose_haar_mmx; + d->vertical_compose = (void*)vertical_compose_haar_mmx; d->horizontal_compose = horizontal_compose_haar0i_mmx; break; case DWT_DIRAC_HAAR1: - d->vertical_compose = vertical_compose_haar_mmx; + d->vertical_compose = (void*)vertical_compose_haar_mmx; d->horizontal_compose = horizontal_compose_haar1i_mmx; break; } @@ -169,23 +169,23 @@ void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) switch (type) { case DWT_DIRAC_DD9_7: - d->vertical_compose_l0 = vertical_compose53iL0_sse2; - d->vertical_compose_h0 = vertical_compose_dd97iH0_sse2; + d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; break; case DWT_DIRAC_LEGALL5_3: - d->vertical_compose_l0 = vertical_compose53iL0_sse2; - d->vertical_compose_h0 = vertical_compose_dirac53iH0_sse2; + d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_sse2; break; case DWT_DIRAC_DD13_7: - d->vertical_compose_l0 = vertical_compose_dd137iL0_sse2; - d->vertical_compose_h0 = vertical_compose_dd97iH0_sse2; + d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; break; case DWT_DIRAC_HAAR0: - d->vertical_compose = vertical_compose_haar_sse2; + d->vertical_compose = (void*)vertical_compose_haar_sse2; d->horizontal_compose = horizontal_compose_haar0i_sse2; break; case DWT_DIRAC_HAAR1: - d->vertical_compose = vertical_compose_haar_sse2; + d->vertical_compose = (void*)vertical_compose_haar_sse2; d->horizontal_compose = horizontal_compose_haar1i_sse2; break; } |