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/dct-test.c | |
| 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/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index a277817452..6cefd9dce0 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -57,7 +57,6 @@ void ff_bfin_fdct(DCTELEM *block); // ALTIVEC void ff_fdct_altivec(DCTELEM *block); -//void ff_idct_altivec(DCTELEM *block);?? no routine // ARM void ff_j_rev_dct_arm(DCTELEM *data); |