mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'
* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
dsputil/pngdsp: fix signed/unsigned type in end comparison
Conflicts:
libavcodec/dsputil.c
See: 454a11a1c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f21ca39e81
|
@ -1857,7 +1857,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type){
|
|||
|
||||
static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){
|
||||
long i;
|
||||
for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
|
||||
for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) {
|
||||
long a = *(long*)(src+i);
|
||||
long b = *(long*)(dst+i);
|
||||
*(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80);
|
||||
|
@ -1882,7 +1882,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
|
|||
}
|
||||
}else
|
||||
#endif
|
||||
for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
|
||||
for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) {
|
||||
long a = *(long*)(src1+i);
|
||||
long b = *(long*)(src2+i);
|
||||
*(long*)(dst+i) = ((a|pb_80) - (b&pb_7f)) ^ ((a^b^pb_80)&pb_80);
|
||||
|
|
Loading…
Reference in New Issue