diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 14:07:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 14:13:38 +0200 |
| commit | 509f502902e3760358d5c0c189f3d288652406e5 (patch) | |
| tree | c577f55e9db991afa1d1aaa0df4d6626e5155b10 /libavcodec/x86/idct_xvid.h | |
| parent | 363307813e834314e85ac833dc17b4a8527c8559 (diff) | |
| parent | 58139e141bfd7116e527bae6a9f71c3b43fc8ff2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
trasher: Include all the necessary headers
x86: Remove some leftover declarations for non-existent functions
ARM: libavresample: NEON optimised generic fltp to s16 conversion
ARM: libavresample: NEON optimised stereo fltp to s16 conversion
ARM: libavresample: NEON optimised flat float to s16 conversion
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/idct_xvid.h')
| -rw-r--r-- | libavcodec/x86/idct_xvid.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/x86/idct_xvid.h b/libavcodec/x86/idct_xvid.h index be91d1c68a..6000654ac4 100644 --- a/libavcodec/x86/idct_xvid.h +++ b/libavcodec/x86/idct_xvid.h @@ -28,8 +28,16 @@ #include <stdint.h> +#include "libavcodec/dsputil.h" + void ff_idct_xvid_mmx(short *block); +void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block); +void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, DCTELEM *block); + void ff_idct_xvid_mmx2(short *block); +void ff_idct_xvid_mmx2_put(uint8_t *dest, int line_size, DCTELEM *block); +void ff_idct_xvid_mmx2_add(uint8_t *dest, int line_size, DCTELEM *block); + void ff_idct_xvid_sse2(short *block); void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block); void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block); |