Merge commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223'

* commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223':
  x86: Factorize duplicated inline assembly snippets

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

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/dsputil_mmx.h
Simple merge

diff --cc libavcodec/x86/hpeldsp_init.c
Simple merge