* commit 'b5b7b75e':
  dsputil: Move get_penalty_factor() to the only place it is used.

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