diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 18:19:23 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 18:25:23 +0400 |
commit | 18b0c39f99eee508107c47345494e535b8757434 (patch) | |
tree | b1418e52aab2f1fb8a171c3bb3fada3c7b0df531 /libavutil/arm | |
parent | d9d0c1ccc3df39fecbbbb6b600c18542741c5a51 (diff) | |
parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: fix addition overflow
g723.1: simplify and fix multiplication overflow
g723.1: deobfuscate an expression
g723.1: remove unused #includes
ARM: add missing "cc" clobber in av_clipl_int32_arm()
rtmp: Factorize the code by adding handle_invoke_error
rtmp: Factorize the code by adding handle_invoke_status
rtmp: Factorize the code by adding handle_invoke_result
libavutil: remove unused av_abort() macro
ffmenc: replace if/abort with assert()
libavutil: drop offsetof() fallback definition
libavutil: drop fallback definitions of INTxx_MIN/MAX
configure: Check for a sctp struct instead of just the header
configure: suncc: Add -xc99 to dependency flags, required on Solaris
doxygen: Fix function parameter names to match the code
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
swf: Move shared table out of the header file
swf: Move swf_audio_codec_tags table to the only place it is used
fate: add G.723.1 decoder tests
Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
-rw-r--r-- | libavutil/arm/intmath.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index ebcb538cc5..4af4bf32d1 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -108,7 +108,7 @@ static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a) "mvnne %1, #1<<31 \n\t" "moveq %0, %Q2 \n\t" "eorne %0, %1, %R2, asr #31 \n\t" - : "=r"(x), "=&r"(y) : "r"(a):"cc"); + : "=r"(x), "=&r"(y) : "r"(a) : "cc"); return x; } |