Michael Niedermayer 8a4464514f Merge remote-tracking branch 'qatar/release/9' into release/1.1 ...

* qatar/release/9:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
  Prepare for 9.2 Release
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

Conflicts:
	RELEASE

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

2013-02-05 16:28:36 +01:00

..

arm

Merge remote-tracking branch 'qatar/master'

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

x86

x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions

2013-01-06 15:46:12 +01:00

audio_convert.c

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

audio_convert.h

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05: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: temporarily store custom matrix in AVAudioResampleContext

2012-12-11 14:00:32 -05:00

audio_mix.c

lavr: call mix_function_init() in ff_audio_mix_set_matrix()

2013-01-24 12:00:08 +01:00

audio_mix.h

lavr: move AudioMix struct definition to audio_mix.c

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

avresample-test.c

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

avresample.h

lavr: fix missing " in header documentation

2013-01-04 10:29:55 +02:00

dither.c

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

dither.h

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

internal.h

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

libavresample.v

…

Makefile

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

options.c

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00

resample_template.c

Merge remote-tracking branch 'qatar/master'

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

resample.c

lavr: remove automatic context close/open for resampling compensation

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

resample.h

lavr: do not pass consumed samples as a parameter to ff_audio_resample()

2012-11-27 16:49:19 -05:00

utils.c

Merge remote-tracking branch 'qatar/master'

2012-12-20 12:18:28 +01:00

version.h

lavr: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05:00