Michael Niedermayer 3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' ... * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-08-09 22:19:45 +02:00
..
aarch64
arm
x86
audio_convert.c	Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'	2014-08-04 02:49:48 +02:00
audio_convert.h
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
audio_mix.c
audio_mix.h
avresample-test.c
avresample.h	Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'	2014-05-29 01:23:22 +02:00
avresampleres.rc
dither.c
dither.h
internal.h
libavresample.v
Makefile	Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'	2014-05-13 22:40:32 +02:00
options.c
resample_template.c
resample.c
resample.h
utils.c	Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'	2014-08-04 02:49:48 +02:00
version.h	Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'	2014-08-09 22:19:45 +02:00