Michael Niedermayer 9766d9c985 Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' ... * commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-31 13:57:09 +01:00
..
arm	Merge remote-tracking branch 'qatar/master'	2012-09-14 14:13:38 +02:00
x86	x86: yasm: Use complete source path for macro helper %includes	2012-10-31 00:37:42 +01: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	lavr: change the type of the data buffers to uint8_t**.	2012-10-05 13:49:44 +02:00
audio_data.h	lavr: change the type of the data buffers to uint8_t**.	2012-10-05 13:49:44 +02:00
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c	lavr: change the type of the data buffers to uint8_t**.	2012-10-05 13:49:44 +02:00
avresample.h	lavr: document upper bound on number of output samples.	2012-10-29 20:05:47 +01:00
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c
resample.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
version.h	lavr: bump major to 1 and declare it stable.	2012-10-05 13:50:13 +02:00