1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavresample
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
audio_convert.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_convert.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_data.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_data.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_mix_matrix.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_mix.c Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c' 2013-10-13 06:48:35 +02:00
audio_mix.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresample-test.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresample.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresampleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
dither.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
dither.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
internal.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavresample.v
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
resample_template.c
resample.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
resample.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
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