diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 00:44:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 00:54:28 +0200 |
| commit | bce42e95d13e3cc9c32bcd75d127c0152e51471d (patch) | |
| tree | ec7e1e19748ce5ee666d2f89aa0fc306d8f462e5 /libavutil | |
| parent | b18c9f1eb024abd239c16636f1ef3a9a02d6f262 (diff) | |
| parent | 313f9fbfbb5a45eefe4bfe7b04e6c83f9b5f77c7 (diff) | |
| download | ffmpeg-bce42e95d13e3cc9c32bcd75d127c0152e51471d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add POWER[5-7] support
arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
vqavideo: return error if image size is not a multiple of block size
cosmetics: indentation
avformat: only fill-in interpolated timestamps if duration is non-zero
avformat: remove a workaround for broken timestamps
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/intreadwrite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h index 4a19a0cc22..0c1f7e82e4 100644 --- a/libavutil/arm/intreadwrite.h +++ b/libavutil/arm/intreadwrite.h @@ -30,7 +30,9 @@ static av_always_inline unsigned AV_RN16(const void *p) { const uint8_t *q = p; unsigned v; -#ifdef __thumb__ +#if !AV_GCC_VERSION_AT_LEAST(4,6) + __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(*(const uint16_t *)q)); +#elif defined __thumb__ __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(q[0]), "m"(q[1])); #else __asm__ ("ldrh %0, %1" : "=r"(v) : "Uq"(q[0]), "m"(q[1])); |