[FFmpeg-cvslog] Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:57:41 2014 +0100| [c49797637ff76e2a08dce7f43c18633e9241ead0] | committer: Michael Niedermayer

Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'

* commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5':
  bfin: Move all assembly declarations only used within one .c file there

Conflicts:
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/vp3_bfin.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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