diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 18:03:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 18:03:19 +0200 |
| commit | 40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5 (patch) | |
| tree | eec277297efb6ae6a3d7239a0e8b4fb344d0178f /libavutil | |
| parent | ab9afcdf0483925b492fc590c383c866e1f1dc31 (diff) | |
| parent | 6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617 (diff) | |
| download | ffmpeg-40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5.tar.gz | |
Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'
* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
aarch64: remove optional :pg_hi21: for adrp instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/aarch64/asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index b6798c4da1..cea564e25f 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -61,7 +61,7 @@ ELF .size \name, . - \name adrp \rd, \val@PAGE add \rd, \rd, \val@PAGEOFF #elif CONFIG_PIC - adrp \rd, :pg_hi21:\val + adrp \rd, \val add \rd, \rd, :lo12:\val #else ldr \rd, =\val |