Consistently use "cpu_flags" as variable/parameter name for CPU flags
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>
lut3d: Fix reading 3dl files with leading comments.

Fixes ticket #2787.
lavf/concat: Never fail for sample aspect ratio 0:1.

Fixes ticket #2456.

Reviewed-by: Nicolas George
Fix pix_fmt detection in the native jpeg2000 decoder.

Based on b7a928b by Michael Bradshaw.
Fixes ticket #2683.

Reviewed-by: Nicolas Bertrand