* commit '87614667':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
	libavcodec/x86/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>