Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:51:15 +0000 (00:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:51:26 +0000 (00:51 +0100)
commitcb416a7d795414aaa534c27943bda0d3aef3b5a1
treee806212c9317a1735923899325e5024a318407cf
parent824932dc473255745218c84033a4bc57ebe48576
parent4c81613df499ba81d64ea102b38d0c6686cc304c
Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/mlpdsp_armv5te.S