Michael Niedermayer 25b243759c Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' ... * commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0': avutil: Move library version related macros to version.h Conflicts: libavcodec/version.h libavresample/version.h libavutil/avutil.h libavutil/utils.c See: 183117fed7 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-12-27 12:01:23 +01:00
..
arm	…
x86	Merge commit '206895708ea2b464755d340e44501daf9a07c310'	2013-10-14 15:54:23 +02:00
Makefile	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
audio_convert.c	…
audio_convert.h	…
audio_data.c	…
audio_data.h	…
audio_mix.c	…
audio_mix.h	…
audio_mix_matrix.c	…
avresample-test.c	…
avresample.h	…
avresampleres.rc	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
dither.c	…
dither.h	…
internal.h	…
libavresample.v	…
options.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
resample.c	…
resample.h	…
resample_template.c	…
utils.c	Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'	2013-10-28 09:59:53 +01:00
version.h	Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'	2013-12-27 12:01:23 +01:00