Michael Niedermayer adfb4661d9 Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4 ...

* commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409':
  avresample: Make sure the even check does not overflow

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

2015-01-18 00:49:47 +01:00

..

aarch64

Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'

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

arm

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

2014-02-08 00:48:26 +01:00

x86

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

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

audio_convert.c

Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

2014-08-17 21:43:06 +02:00

audio_convert.h

Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'

2014-04-22 23:33:07 +02:00

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

Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4

2015-01-18 00:49:47 +01:00

audio_mix.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

audio_mix.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

avresample-test.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

avresample.h

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

2014-08-10 18:20:37 +02:00

avresampleres.rc

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

dither.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

dither.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

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

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

resample_template.c

Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

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

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 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

2014-08-10 18:20:37 +02:00

version.h

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

2014-08-10 18:20:37 +02:00