diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:25:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:44:32 +0200 |
| commit | 406cdddbdd229cead581eb1c7b978a2c59453b24 (patch) | |
| tree | 0c36c4c2fcafb618ae80074a9a1c07a06872a91f /libavutil | |
| parent | 9543cd593ed8249e9885598fc53de163c9d4e2d3 (diff) | |
| parent | e52e4fe10d96da4ed26e2acbe3c1ab69485ed75d (diff) | |
| download | ffmpeg-406cdddbdd229cead581eb1c7b978a2c59453b24.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: add forgotten ;
matroskadec: fix a sanity check.
matroskadec: only return corrupt packets that actually contain data
lavf: zero data/size of the packet passed to read_packet().
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
ARM: align PIC offset pools to 4 bytes
ARM: swap source operands in some add instructions
configure: update tms470 detection for latest version
lavf probe: prevent codec probe with no data at all seen
motion_est: fix use of inline on extern functions
Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 340ee18e8a..b9d4b737ad 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -66,6 +66,7 @@ ELF .eabi_attribute 25, \val .set .Lpic_gp, 0 .macro endfunc .if .Lpic_idx + .align 2 .altmacro put_pic %(.Lpic_idx - 1) .noaltmacro @@ -142,7 +143,7 @@ ELF .size \name, . - \name .if \indir ldr \rd, [pc, \rd] .else - add \rd, pc, \rd + add \rd, pc .endif def_pic \val - (.Lpic\@ + (8 >> CONFIG_THUMB)), .Lpicoff\@ .endm |