eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/tdsc: Fix undefined shifts

Browse Source 
Fixes the tdsc FATE-test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 86bef10e7a)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2019-09-20 00:16:59 +02:00
parent 95530c659c
commit 0b4fe2155e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/tdsc.c
View File

@@ -187,7 +187,7 @@ static void tdsc_paint_cursor(AVCodecContext *avctx, uint8_t *dst, int stride)
static int tdsc_load_cursor(AVCodecContext *avctx) static int tdsc_load_cursor(AVCodecContext *avctx)
{ {
TDSCContext *ctx = avctx->priv_data; TDSCContext *ctx = avctx->priv_data;
int i, j, k, ret, bits, cursor_fmt; int i, j, k, ret, cursor_fmt;
uint8_t *dst; uint8_t *dst;
ctx->cursor_hot_x = bytestream2_get_le16(&ctx->gbc); ctx->cursor_hot_x = bytestream2_get_le16(&ctx->gbc);
@@ -231,7 +231,7 @@ static int tdsc_load_cursor(AVCodecContext *avctx)
case CUR_FMT_MONO: case CUR_FMT_MONO:
for (j = 0; j < ctx->cursor_h; j++) { for (j = 0; j < ctx->cursor_h; j++) {
for (i = 0; i < ctx->cursor_w; i += 32) { for (i = 0; i < ctx->cursor_w; i += 32) {
bits = bytestream2_get_be32(&ctx->gbc); uint32_t bits = bytestream2_get_be32(&ctx->gbc);
for (k = 0; k < 32; k++) { for (k = 0; k < 32; k++) {
dst[0] = !!(bits & 0x80000000); dst[0] = !!(bits & 0x80000000);
dst += 4; dst += 4;
@@ -244,7 +244,7 @@ static int tdsc_load_cursor(AVCodecContext *avctx)
dst = ctx->cursor; dst = ctx->cursor;
for (j = 0; j < ctx->cursor_h; j++) { for (j = 0; j < ctx->cursor_h; j++) {
for (i = 0; i < ctx->cursor_w; i += 32) { for (i = 0; i < ctx->cursor_w; i += 32) {
bits = bytestream2_get_be32(&ctx->gbc); uint32_t bits = bytestream2_get_be32(&ctx->gbc);
for (k = 0; k < 32; k++) { for (k = 0; k < 32; k++) {
int mask_bit = !!(bits & 0x80000000); int mask_bit = !!(bits & 0x80000000);
switch (dst[0] * 2 + mask_bit) { switch (dst[0] * 2 + mask_bit) {