Michael Niedermayer 082dd17bd2 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avresample: use valid log context in mixing functions
  lavr: remove automatic context close/open for resampling compensation

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-12-17 14:11:51 +01:00

..

arm

…

x86

…

audio_convert.c

…

audio_convert.h

…

audio_data.c

…

audio_data.h

…

audio_mix_matrix.c

…

audio_mix.c

avresample: use valid log context in mixing functions

2012-12-16 19:59:58 -05:00

audio_mix.h

lavr: move AudioMix struct definition to audio_mix.c

2012-12-15 12:26:15 -05:00

avresample-test.c

…

avresample.h

lavr: remove automatic context close/open for resampling compensation

2012-12-16 19:26:17 -05:00

internal.h

…

libavresample.v

…

Makefile

…

options.c

…

resample_template.c

…

resample.c

lavr: only save/restore the mixing matrix if mixing is being done

2012-12-16 19:26:17 -05:00

resample.h

…

utils.c

Merge remote-tracking branch 'qatar/master'

2012-12-12 10:50:21 +01:00

version.h

lavr: remove automatic context close/open for resampling compensation

2012-12-16 19:26:17 -05:00