[FFmpeg-cvslog] Merge commit '40ad05bab206c932a32171d45581080c914b06ec'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Wed Mar 15 12:32:15 2017 +0100| [8b13492c9ecf85f1f674f99df370a19992b3910a] | committer: Clément Bœsch

Merge commit '40ad05bab206c932a32171d45581080c914b06ec'

* commit '40ad05bab206c932a32171d45581080c914b06ec':
  checkasm: Cast unsigned to signed

Merged-by: Clément Bœsch <cboesch at gopro.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b13492c9ecf85f1f674f99df370a19992b3910a
---

 tests/checkasm/checkasm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index f671980..ecfa5d2 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -217,7 +217,7 @@ int float_near_ulp(float a, float b, unsigned max_ulp)
         return a == b;
     }
 
-    if (abs(x.i - y.i) <= max_ulp)
+    if (llabs((int64_t)x.i - y.i) <= max_ulp)
         return 1;
 
     return 0;


======================================================================