Michael Niedermayer 509f502902 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>		2012-09-14 14:13:38 +02:00
..
arm	Merge remote-tracking branch 'qatar/master'	2012-09-14 14:13:38 +02:00
x86	x86: Replace checks for CPU extensions and flags by convenience macros	2012-09-08 18:18:34 +02:00
audio_convert.c	ARM: libavresample: NEON optimised flat float to s16 conversion	2012-09-13 19:15:42 +01:00
audio_convert.h	ARM: libavresample: NEON optimised flat float to s16 conversion	2012-09-13 19:15:42 +01:00
audio_data.c
audio_data.h
audio_mix.c
audio_mix.h
audio_mix_matrix.c	lavr/audio_mix_matrix: acknowledge the existence of LFE2.	2012-09-12 18:26:53 -04:00
avresample-test.c
avresample.h
internal.h
libavresample.v
Makefile
options.c	avopt: Explicitly store float/double option defaults in .dbl	2012-09-04 23:13:51 +03:00
resample.c
resample.h
resample_template.c
utils.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
version.h