Michael Niedermayer 781fd58838 Merge commit 'cc976a75df' ... * commit 'cc976a75df': audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-01-04 02:30:07 +01:00
..
arm
x86	Merge commit '206895708e'	2013-10-14 15:54:23 +02:00
audio_convert.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
audio_convert.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
audio_data.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
audio_data.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
audio_mix.c	Merge commit 'cc976a75df'	2014-01-04 02:30:07 +01:00
audio_mix.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
audio_mix_matrix.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
avresample-test.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
avresample.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
avresampleres.rc	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
dither.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
dither.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
internal.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
libavresample.v
Makefile	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
options.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
resample.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
resample.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
resample_template.c
utils.c	Merge commit '211ca69b13'	2013-10-28 09:59:53 +01:00
version.h	Merge commit 'b83d1ee3b4'	2013-12-27 12:01:23 +01:00