[FFmpeg-cvslog] Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 02:04:54 2014 +0100| [26f4a509820d616127b359ea4cdd61ae4bcd70b5] | committer: Michael Niedermayer

Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'

* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
  bfin: dsputil: Unconditionally compile hpel pixels code

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

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