[FFmpeg-cvslog] Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:48:36 2014 +0100| [a4369dbb8fdae63cdfad6f4e3cc41c0f457f6027] | committer: Michael Niedermayer

Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515'

* commit '1e33095b83addd8d24bc16bd08aa734fa161d515':
  bfin: dsputil: Drop broken and trivial profiling code

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

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