[FFmpeg-cvslog] Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 10 00:51:15 2014 +0100| [cb416a7d795414aaa534c27943bda0d3aef3b5a1] | committer: Michael Niedermayer

Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

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

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