[FFmpeg-cvslog] Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 16 00:40:57 2013 +0200| [398b9ed28f589999e6135b367ef0180944159db6] | committer: Michael Niedermayer

Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'

* commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=398b9ed28f589999e6135b367ef0180944159db6
---