master
avutil/arm: Add armv6 optimizations for pixelutils
libavutil/arm: Fix indentation in asm.S
lavu/arm: remove GCC 4.6- stuff
arm: Avoid warnings about redefining HWCAP constants
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
Reinstate proper FFmpeg license for all files.
configure: Remove av_restrict
armv6: Accelerate butterflies_float
arm: Check the build time constants in av_clip_*intp2
all: Add missing header guards
arm/timer: disable PMCCNTR timer for Android