diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/xan.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/xan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/xan.c b/src/libffmpeg/libavcodec/xan.c index 49e207677..742bd3705 100644 --- a/src/libffmpeg/libavcodec/xan.c +++ b/src/libffmpeg/libavcodec/xan.c @@ -58,6 +58,10 @@ typedef struct XanContext { } XanContext; +#undef BE_16 +#undef LE_16 +#undef LE_32 + #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) #define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ @@ -69,6 +73,8 @@ typedef struct XanContext { #define SCALEFACTOR 65536 #define CENTERSAMPLE 128 +#undef COMPUTE_Y + #define COMPUTE_Y(r, g, b) \ (unsigned char) \ ((y_r_table[r] + y_g_table[g] + y_b_table[b]) / SCALEFACTOR) |