Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/magicyuvenc.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c
index 3ae1ee2c71..93eabb9f9a 100644
--- a/libavcodec/magicyuvenc.c
+++ b/libavcodec/magicyuvenc.c
@@ -211,10 +211,13 @@ static av_cold int magy_encode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
if (s->correlate) {
- s->decorrelate_buf[0] = av_calloc(2U * (s->nb_slices *
s->slice_height), FFALIGN(avctx->width, av_cpu_max_align()));
+ size_t max_align = av_cpu_max_align();
+ size_t aligned_width = FFALIGN(avctx->width, max_align);
+ s->decorrelate_buf[0] = av_calloc(2U * (s->nb_slices *
s->slice_height),
+ aligned_width);
if (!s->decorrelate_buf[0])
return AVERROR(ENOMEM);
- s->decorrelate_buf[1] = s->decorrelate_buf[0] + (s->nb_slices *
s->slice_height) * FFALIGN(avctx->width, av_cpu_max_align());
+ s->decorrelate_buf[1] = s->decorrelate_buf[0] + (s->nb_slices *
s->slice_height) * aligned_width;
}
s->bitslice_size = avctx->width * s->slice_height + 2;
@@ -493,7 +496,8 @@ static int encode_slice(AVCodecContext *avctx, void *tdata,
static int predict_slice(AVCodecContext *avctx, void *tdata,
int n, int threadnr)
{
- const int aligned_width = FFALIGN(avctx->width, av_cpu_max_align());
+ size_t max_align = av_cpu_max_align();
+ const int aligned_width = FFALIGN(avctx->width, max_align);
MagicYUVContext *s = avctx->priv_data;
const int slice_height = s->slice_height;
const int last_height = FFMIN(slice_height, avctx->height - n *
slice_height);
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
