Michael Niedermayer bdb2e80e88 Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' ... * commit 'b2d45654220503224aa94e78cdff19ec624e9342': avresample: Add avresample_get_out_samples Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-29 01:23:22 +02:00
..
aarch64	Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'	2014-04-25 01:19:27 +02:00
arm	Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'	2014-02-08 00:48:26 +01:00
x86	Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'	2014-04-05 19:16:39 +02:00
audio_convert.c	Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'	2014-04-22 23:33:07 +02:00
audio_convert.h	Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'	2014-04-22 23:33:07 +02:00
audio_data.c
audio_data.h
audio_mix_matrix.c	Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'	2014-02-08 18:38:17 +01:00
audio_mix.c	Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'	2014-01-04 02:30:07 +01:00
audio_mix.h
avresample-test.c
avresample.h	Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'	2014-05-29 01:23:22 +02:00
avresampleres.rc	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
dither.c
dither.h
internal.h	Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'	2014-04-25 01:19:27 +02:00
libavresample.v
Makefile	Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'	2014-05-13 22:40:32 +02:00
options.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
resample_template.c	Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'	2014-04-11 20:39:04 +02:00
resample.c	Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'	2014-04-25 01:19:27 +02:00
resample.h	Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'	2014-04-25 01:17:15 +02:00
utils.c	Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'	2014-05-29 01:23:22 +02:00
version.h	Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'	2014-05-29 01:23:22 +02:00