1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavresample
Michael Niedermayer 1e4e497911 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:11:53 +01:00
..
arm
x86 x86: avresample: Add missing colons to assembly labels 2012-11-06 12:07:35 +01: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
version.h