Michael Niedermayer 85cf049d50 Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e' ... * commit '963f76144897d3f7684d82ec21e51dd50ea1106e': avresample: Make sure the even check does not overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-10-18 22:53:23 +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 '11db644a8e54f02e54d2eaad343a87fcb697c15e'	2014-08-17 21:43:06 +02:00
audio_convert.h	Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'	2014-04-22 23:33:07 +02:00
audio_data.c	Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'	2014-08-04 02:49:48 +02:00
audio_data.h	Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'	2014-08-04 02:49:48 +02:00
audio_mix_matrix.c	Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'	2014-10-18 22:53:23 +02:00
audio_mix.c	Add missing "const" all over the place.	2014-08-29 18:57:25 +02:00
audio_mix.h
avresample-test.c
avresample.h	Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'	2014-08-10 18:20:37 +02:00
avresampleres.rc
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
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 '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'	2014-10-18 22:15:23 +02:00
version.h	Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'	2014-08-10 18:20:37 +02:00