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)
* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

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

Simple merge