]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '08cd92144e73195eecc28ed0348e66e255516b82'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 16:14:56 +0000 (18:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 16:16:15 +0000 (18:16 +0200)
* commit '08cd92144e73195eecc28ed0348e66e255516b82':
  aarch64: Use the correct syntax for relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/aarch64/asm.S

Simple merge