Michael Niedermayer 11d187b377 Merge commit '21d8f4da91673051ad7055cf63d989488a56368e' ...

* commit '21d8f4da91673051ad7055cf63d989488a56368e':
  resample: remove an unneeded context variable

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

2014-04-17 21:07:25 +02:00

..

aarch64

…

arm

…

x86

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

audio_convert.c

…

audio_convert.h

…

audio_data.c

…

audio_data.h

…

audio_mix_matrix.c

Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'

2014-02-08 18:38:17 +01:00

audio_mix.c

…

audio_mix.h

…

avresample-test.c

…

avresample.h

Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'

2014-02-22 21:06:02 +01:00

avresampleres.rc

…

dither.c

…

dither.h

…

internal.h

…

libavresample.v

…

Makefile

…

options.c

…

resample_template.c

Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

2014-04-11 20:39:04 +02:00

resample.c

Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

2014-04-17 21:07:25 +02:00

resample.h

…

utils.c

Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'

2014-04-13 14:33:42 +02:00

version.h

Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'

2014-02-22 21:06:02 +01:00