X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsdsdec.c;h=c70f5af849469ce2e53f49ede940380e9201ae6e;hb=339af976b6fd9c05d1e75e75a5323efdb3d6afa1;hp=081bb4ca2d8740e73f1a747b69f7648087710862;hpb=d0c43e32427ec1efac364be0987a6aafa695527f;p=ffmpeg diff --git a/libavformat/sdsdec.c b/libavformat/sdsdec.c index 081bb4ca2d8..c70f5af8494 100644 --- a/libavformat/sdsdec.c +++ b/libavformat/sdsdec.c @@ -30,7 +30,7 @@ typedef struct SDSContext { void (*read_block)(const uint8_t *src, uint32_t *dst); } SDSContext; -static int sds_probe(AVProbeData *p) +static int sds_probe(const AVProbeData *p) { if (AV_RB32(p->buf) == 0xF07E0001 && p->buf[20] == 0xF7 && p->buf[6] >= 8 && p->buf[6] <= 28) @@ -43,7 +43,7 @@ static void byte2_read(const uint8_t *src, uint32_t *dst) int i; for (i = 0; i < 120; i += 2) { - unsigned sample = (src[i + 0] << 25) + (src[i + 1] << 18); + unsigned sample = ((unsigned)src[i + 0] << 25) + ((unsigned)src[i + 1] << 18); dst[i / 2] = sample; } @@ -56,7 +56,7 @@ static void byte3_read(const uint8_t *src, uint32_t *dst) for (i = 0; i < 120; i += 3) { unsigned sample; - sample = (src[i + 0] << 25) | (src[i + 1] << 18) | (src[i + 2] << 11); + sample = ((unsigned)src[i + 0] << 25) | ((unsigned)src[i + 1] << 18) | ((unsigned)src[i + 2] << 11); dst[i / 3] = sample; } } @@ -68,7 +68,7 @@ static void byte4_read(const uint8_t *src, uint32_t *dst) for (i = 0; i < 120; i += 4) { unsigned sample; - sample = (src[i + 0] << 25) | (src[i + 1] << 18) | (src[i + 2] << 11) | (src[i + 3] << 4); + sample = ((unsigned)src[i + 0] << 25) | ((unsigned)src[i + 1] << 18) | ((unsigned)src[i + 2] << 11) | ((unsigned)src[i + 3] << 4); dst[i / 4] = sample; } }