Merge commit 'c0dcf898'

* commit 'c0dcf898':
  bfin: Match DEFUN_END macros to the right functions

Conflicts:
	libavcodec/bfin/pixels_bfin.S

This bug seems not to have existed in our bfin code, thus
no change in this merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>