diff options
Diffstat (limited to 'ethosu/mlw_codec/mlw_encode.c')
| -rw-r--r-- | ethosu/mlw_codec/mlw_encode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ethosu/mlw_codec/mlw_encode.c b/ethosu/mlw_codec/mlw_encode.c index 7820106e..04afa3ee 100644 --- a/ethosu/mlw_codec/mlw_encode.c +++ b/ethosu/mlw_codec/mlw_encode.c @@ -33,8 +33,12 @@ #define ZERO_RUN_THRES 4 +#ifndef min #define min(a,b) ((a)<(b)?(a):(b)) +#endif +#ifndef max #define max(a,b) ((a)>(b)?(a):(b)) +#endif typedef struct palette { int16_t lut[32]; @@ -258,7 +262,7 @@ static void create_palette( int freq[512], // Setup the 32 entry palette int palette_max_val = 0, val, cnt, pal_cnt=0; for(i=0; i<max_palette_size; i++) { - cnt = freq64[i]>>16; + cnt = (int)(freq64[i]>>16); val = freq64[i]&0xffff; if ( cnt==0 ) break; |