| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From a99aff4e4bbef8e64b51f267cd1769214e1b4e80 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Niedermayer <michaelni@gmx.at> |
| 3 | Date: Fri, 30 Aug 2013 23:40:47 +0200 |
| 4 | Subject: [PATCH] avcodec/dsputil: fix signedness in sizeof() comparissions |
| 5 | |
| 6 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 7 | (cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760) |
| 8 | |
| 9 | Upstream-Status: Backport |
| 10 | |
| 11 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 12 | --- |
| 13 | libavcodec/dsputil.c | 4 ++-- |
| 14 | 1 files changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c |
| 17 | index 53dc2eb..6264832 100644 |
| 18 | --- a/gst-libs/ext/libav/libavcodec/dsputil.c |
| 19 | +++ b/gst-libs/ext/libav/libavcodec/dsputil.c |
| 20 | @@ -1912,7 +1912,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type){ |
| 21 | |
| 22 | static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){ |
| 23 | long i; |
| 24 | - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ |
| 25 | + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ |
| 26 | long a = *(long*)(src+i); |
| 27 | long b = *(long*)(dst+i); |
| 28 | *(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80); |
| 29 | @@ -1937,7 +1937,7 @@ static void diff_bytes_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w){ |
| 30 | } |
| 31 | }else |
| 32 | #endif |
| 33 | - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ |
| 34 | + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ |
| 35 | long a = *(long*)(src1+i); |
| 36 | long b = *(long*)(src2+i); |
| 37 | *(long*)(dst+i) = ((a|pb_80) - (b&pb_7f)) ^ ((a^b^pb_80)&pb_80); |
| 38 | -- |
| 39 | 1.7.5.4 |
| 40 | |