Michael Niedermayer d27edc038a Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' ...

* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
  miscellaneous typo fixes

Conflicts:
	libavcodec/4xm.c
	libavcodec/lagarith.c
	libavcodec/parser.c
	libavcodec/ratecontrol.c
	libavcodec/shorten.c
	libavcodec/vda_h264.c
	libavformat/dvenc.c
	libavformat/wtv.c
	tools/patcheck

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

2012-12-21 17:32:52 +01:00

..

arm

Merge remote-tracking branch 'qatar/master'

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

x86

Merge remote-tracking branch 'qatar/master'

2012-11-18 13:35:15 +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

avresample: use valid log context in mixing functions

2012-12-16 19:59:58 -05: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: add option for dithering during sample format conversion to s16

2012-12-19 18:52:54 -05: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

…

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