Michael Niedermayer
authored
* 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>| Name | Last commit | Last update |
|---|---|---|
| .. | ||
| Makefile | ||
| audio_convert_init.c | ||
| audio_convert_neon.S | ||