arm: Macroize the test for 'setend' CPU instruction support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '78670fbf07bd03479073d4218440de4914304680'

* commit '78670fbf07bd03479073d4218440de4914304680':
  imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
hevc/rext: update boundary strength for chroma deblocking filter

cherry picked from commit 7d05c95ac5a63d7675bf645e74b4cf1fffff4796

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