Michael Niedermayer c62fea7574 Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' ...

* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

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

2014-08-04 02:49:48 +02:00

..

aarch64

Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'

2014-04-25 01:19:27 +02:00

arm

…

x86

…

audio_convert.c

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

audio_convert.h

…

audio_data.c

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

audio_data.h

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

audio_mix_matrix.c

…

audio_mix.c

…

audio_mix.h

…

avresample-test.c

…

avresample.h

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

2014-05-29 01:23:22 +02:00

avresampleres.rc

…

dither.c

…

dither.h

…

internal.h

Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'

2014-04-25 01:19:27 +02:00

libavresample.v

…

Makefile

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

2014-05-13 22:40:32 +02:00

options.c

…

resample_template.c

…

resample.c

Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'

2014-04-25 01:19:27 +02:00

resample.h

Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'

2014-04-25 01:17:15 +02:00

utils.c

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

version.h

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

2014-05-29 01:23:22 +02:00