Michael Niedermayer e79c3858b3 Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' ... * commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8': dv: use AVStream.index instead of abusing AVStream.id lavfi: add ashowinfo filter avcodec: Add a RFC 3389 comfort noise codec lpc: Add a function for calculating reflection coefficients from samples lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients lavr: document upper bound on number of output samples. lavr: add general API usage doxy indeo3: remove duplicate capabilities line. fate: ac3: Add dependencies Conflicts: Changelog doc/filters.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavfilter/Makefile libavfilter/af_ashowinfo.c libavfilter/allfilters.c libavfilter/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-30 14:40:22 +01:00
..
arm
x86	lavr: handle clipping in the float to s32 conversion	2012-10-13 12:34:34 +02:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c
avresample.h	lavr: document upper bound on number of output samples.	2012-10-29 20:05:47 +01:00
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c
resample.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
version.h	lavr: bump major to 1 and declare it stable.	2012-10-05 13:50:13 +02:00