diff options
| author | Jai Luthra <me@jailuthra.in> | 2020-02-03 00:32:59 +0530 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2020-02-04 11:19:12 +0100 |
| commit | d6cef144e21763927ae8992221dc587c3398b4ef (patch) | |
| tree | b133394d01cf9f7cff14ff70f6e7b4b41c36aa4a /libavcodec/mlpenc.c | |
| parent | ad2638473486a2d0f14e2522c1e55d0d5b5d50a3 (diff) | |
| download | ffmpeg-d6cef144e21763927ae8992221dc587c3398b4ef.tar.gz | |
mlpenc: fix some -fsanitize=integer errors
Signed-off-by: Jai Luthra <me@jailuthra.in>
Diffstat (limited to 'libavcodec/mlpenc.c')
| -rw-r--r-- | libavcodec/mlpenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index cda14e7ac1..8e45da4569 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -87,11 +87,11 @@ typedef struct { } DecodingParams; typedef struct BestOffset { - int16_t offset; + int32_t offset; int bitcount; int lsb_bits; - int16_t min; - int16_t max; + int32_t min; + int32_t max; } BestOffset; #define HUFF_OFFSET_MIN (-16384) @@ -1249,7 +1249,7 @@ static void input_data_internal(MLPEncodeContext *ctx, const uint8_t *samples, uint32_t abs_sample; int32_t sample; - sample = is24 ? *samples_32++ >> 8 : *samples_16++ * 256U; + sample = is24 ? *samples_32++ >> 8 : *samples_16++ * 256; /* TODO Find out if number_sbits can be used for negative values. */ abs_sample = FFABS(sample); @@ -1792,7 +1792,7 @@ static void determine_bits(MLPEncodeContext *ctx) #define SAMPLE_MAX(bitdepth) ((1 << (bitdepth - 1)) - 1) #define SAMPLE_MIN(bitdepth) (~SAMPLE_MAX(bitdepth)) -#define MSB_MASK(bits) (-(1u << (bits))) +#define MSB_MASK(bits) (-(int)(1u << (bits))) /** Applies the filter to the current samples, and saves the residual back * into the samples buffer. If the filter is too bad and overflows the |