Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:03:15 +0000 (18:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:03:19 +0000 (18:03 +0200)
commit40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5
treeeec277297efb6ae6a3d7239a0e8b4fb344d0178f
parentab9afcdf0483925b492fc590c383c866e1f1dc31
parent6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617
Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
  aarch64: remove optional :pg_hi21: for adrp instruction

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