ffmpeg/libavresample
Michael Niedermayer 78eaaa857e Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
	libavresample/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:20:37 +02:00
..
aarch64 Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
arm
x86
Makefile Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
audio_convert.c Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 2014-08-04 02:49:48 +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.c
audio_mix.h
audio_mix_matrix.c
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
options.c
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
resample_template.c
utils.c Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
version.h Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00