ffmpeg/libavresample
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
x86 Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
Makefile
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix.c
audio_mix.h
audio_mix_matrix.c
avresample-test.c
avresample.h
dither.c
dither.h
internal.h
libavresample.v
options.c
resample.c
resample.h
resample_template.c
utils.c
version.h