mirror of https://git.ffmpeg.org/ffmpeg.git
509f502902
* 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> |
||
---|---|---|
.. | ||
arm | ||
x86 | ||
Makefile | ||
audio_convert.c | ||
audio_convert.h | ||
audio_data.c | ||
audio_data.h | ||
audio_mix.c | ||
audio_mix.h | ||
audio_mix_matrix.c | ||
avresample-test.c | ||
avresample.h | ||
internal.h | ||
libavresample.v | ||
options.c | ||
resample.c | ||
resample.h | ||
resample_template.c | ||
utils.c | ||
version.h |