Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Jul 2013 07:53:47 +0000 (09:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Jul 2013 07:53:47 +0000 (09:53 +0200)
commit9d01bf7d66df74fe58d71b7e93e86895270a91c2
tree57ccb1be5c5c768f2213e6abab3fba03d32dfcb7
parent1816f5509e4f0fd55d32b5dbf70c3be21c1b1515
parent3ac7fa81b2383ff2697e5d1a76ff79be205f011a
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>
30 files changed:
libavcodec/ppc/hpeldsp_altivec.c
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fft_init.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/h264chroma_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/lpc.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegaudiodsp.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/pngdsp_init.c
libavcodec/x86/proresdsp_init.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/sbrdsp_init.c
libavcodec/x86/videodsp_init.c
libavcodec/x86/vorbisdsp_init.c
libavcodec/x86/vp3dsp_init.c
libavcodec/x86/vp56dsp_init.c
libavcodec/x86/vp8dsp_init.c
libavfilter/x86/af_volume_init.c
libavresample/x86/dither_init.c
libavutil/ppc/float_dsp_init.c
libavutil/x86/float_dsp_init.c