Michael Niedermayer 9766d9c985 Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' ...

* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
	Makefile

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

2012-10-31 13:57:09 +01:00

..

arm

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

x86

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

audio_convert.c

ARM: libavresample: NEON optimised flat float to s16 conversion

2012-09-13 19:15:42 +01:00

audio_convert.h

ARM: libavresample: NEON optimised flat float to s16 conversion

2012-09-13 19:15:42 +01:00

audio_data.c

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

audio_data.h

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

audio_mix_matrix.c

lavr/audio_mix_matrix: acknowledge the existence of LFE2.

2012-09-12 18:26:53 -04:00

audio_mix.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

audio_mix.h

doxygen: Fix function parameter names to match the code

2012-08-09 20:05:55 +02:00

avresample-test.c

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

avresample.h

lavr: document upper bound on number of output samples.

2012-10-29 20:05:47 +01:00

internal.h

libavresample: add mix level normalization option

2012-08-14 23:36:56 +02:00

libavresample.v

…

Makefile

build: cosmetics: Add missing end-of-line backslashes to item lists.

2012-05-07 14:17:40 +02:00

options.c

avopt: Explicitly store float/double option defaults in .dbl

2012-09-04 23:13:51 +03:00

resample_template.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

resample.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

resample.h

…

utils.c

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

version.h

lavr: bump major to 1 and declare it stable.

2012-10-05 13:50:13 +02:00