Michael Niedermayer 9d01bf7d66 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideo.c
	libavcodec/x86/proresdsp_init.c

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

2013-07-18 09:53:47 +02:00

..

arm

Merge remote-tracking branch 'qatar/master'

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

x86

Merge remote-tracking branch 'qatar/master'

2013-07-18 09:53:47 +02:00

audio_convert.c

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -05:00

audio_convert.h

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -05:00

audio_data.c

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -05:00

audio_data.h

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -05:00

audio_mix_matrix.c

lavr: temporarily store custom matrix in AVAudioResampleContext

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

audio_mix.c

avresample: Add av_cold attributes to init functions missing them

2013-05-04 21:10:05 +02:00

audio_mix.h

lavr: typedef internal structs in internal.h

2013-01-07 21:49:05 -05:00

avresample-test.c

miscellaneous typo fixes

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

avresample.h

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -05:00

dither.c

avresample: Add av_cold attributes to init functions missing them

2013-05-04 21:10:05 +02:00

dither.h

x86: lavr: add SSE2 quantize() for dithering

2013-01-08 14:52:43 -05:00

internal.h

lavr: add a public function for setting a custom channel map

2013-01-07 21:49:06 -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: allow setting internal_sample_fmt option by string

2013-02-23 17:07:54 -05:00

resample_template.c

Merge remote-tracking branch 'qatar/master'

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

resample.c

lavr: typedef internal structs in internal.h

2013-01-07 21:49:05 -05:00

resample.h

lavr: typedef internal structs in internal.h

2013-01-07 21:49:05 -05:00

utils.c

Merge commit '074a00d192c0e749d677b008b337da42597e780f'

2013-01-08 12:56:41 +01:00

version.h

lavr doxy: add version.h to the lavr group

2013-05-17 20:27:48 +02:00