diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-27 00:40:32 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-27 23:05:26 +0100 |
| commit | 0c204ce9f6b6d1ac3c0ed399bb8b7aa8768d05d9 (patch) | |
| tree | 5d49bc9330ec6dcf05f17a668e6db28be1d39ca5 | |
| parent | 7945d30e91b96d2f4f5b612048169087d214d41e (diff) | |
| download | ffmpeg-0c204ce9f6b6d1ac3c0ed399bb8b7aa8768d05d9.tar.gz | |
avcodec/dxvenc: Use proper alignment, write endian-independent output
Fixes the dxv3enc-dxt1 FATE test with UBSan and on big-endian
hardware.
Reviewed-by: James Almer <jamrial@gmail.com>
Tested-by: Sean McGovern <gseanmcg@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/dxvenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 1ce2b1d014..91f4ba7619 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -134,7 +134,7 @@ typedef struct DXVEncContext { if (bytestream2_get_bytes_left_p(pbc) < 4) { \ return AVERROR_INVALIDDATA; \ } \ - value = (uint32_t*)pbc->buffer; \ + value = pbc->buffer; \ bytestream2_put_le32(pbc, 0); \ state = 0; \ } \ @@ -149,7 +149,7 @@ typedef struct DXVEncContext { } else { \ op = 0; \ } \ - *value |= (op << (state * 2)); \ + AV_WL32(value, AV_RL32(value) | (op << (state * 2))); \ state++; \ } while (0) @@ -157,7 +157,7 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) { DXVEncContext *ctx = avctx->priv_data; PutByteContext *pbc = &ctx->pbc; - uint32_t *value; + void *value; uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 2, op = 0; ht_init(ctx->color_lookback_ht); |