* commit 'da785231':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
	libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>