* commit 'da5be235':
  dsputil: Move RV40-specific bits into rv40dsp

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