Michael Niedermayer 264441715b Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' ... * commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563': vble: Do not abort decoding when version is not 1 lavr: do not pass consumed samples as a parameter to ff_audio_resample() lavr: correct the documentation for the ff_audio_resample() return value lavr: do not pass sample count as a parameter to ff_audio_convert() x86: h264_weight: port to cpuflags configure: Enable avconv filter dependencies automatically Conflicts: configure libavcodec/x86/h264_weight.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-11-28 13:27:18 +01:00
..
arm
x86	Merge remote-tracking branch 'qatar/master'	2012-11-18 13:35:15 +01:00
audio_convert.c	lavr: do not pass sample count as a parameter to ff_audio_convert()	2012-11-27 16:49:18 -05:00
audio_convert.h	lavr: do not pass sample count as a parameter to ff_audio_convert()	2012-11-27 16:49:18 -05:00
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c
avresample.h	Include libavutil/channel_layout.h instead of libavutil/audioconvert.h	2012-11-11 13:35:12 -05:00
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c	lavr: do not pass consumed samples as a parameter to ff_audio_resample()	2012-11-27 16:49:19 -05:00
resample.h	lavr: do not pass consumed samples as a parameter to ff_audio_resample()	2012-11-27 16:49:19 -05:00
utils.c	Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'	2012-11-28 13:27:18 +01:00
version.h