RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 09:35:22 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/huffyuvencdsp: use an actual unsigned long constant

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-02-06 19:57:53 -03:00
parent 21d25da180
commit b921b3b42b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/huffyuvencdsp.c
View File

@ -21,6 +21,9 @@
#include "huffyuvencdsp.h" #include "huffyuvencdsp.h"
#include "mathops.h" #include "mathops.h"
// 0x00010001 or 0x0001000100010001 or whatever, depending on the cpu's native arithmetic size
#define pw_1 (ULONG_MAX / UINT16_MAX)
static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){
long i; long i;
#if !HAVE_FAST_UNALIGNED #if !HAVE_FAST_UNALIGNED
@ -34,8 +37,8 @@ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *sr
}else }else
#endif #endif
{ {
unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL; unsigned long pw_lsb = (mask >> 1) * pw_1;
unsigned long pw_msb = pw_lsb + 0x0001000100010001ULL; unsigned long pw_msb = pw_lsb + pw_1;
for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) { for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) {
long a = *(long*)(src1+i); long a = *(long*)(src1+i);