Fixes -Wstringop-overflow warnings with libaom >= 2.0.0, where the unused alpha
plane was removed from aom_image.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/libaomdec.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c
index 75ecc08970..e590c58d9d 100644
--- a/libavcodec/libaomdec.c
+++ b/libavcodec/libaomdec.c
@@ -224,9 +224,13 @@ static int aom_decode(AVCodecContext *avctx, void *data,
int *got_frame,
if ((img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) && img->bit_depth == 8)
image_copy_16_to_8(picture, img);
- else
- av_image_copy(picture->data, picture->linesize, (const uint8_t
**)img->planes,
- img->stride, avctx->pix_fmt, img->d_w, img->d_h);
+ else {
+ const uint8_t *planes[4] = { img->planes[0], img->planes[1],
img->planes[2] };
+ const int stride[4] = { img->stride[0], img->stride[1],
img->stride[2] };
+
+ av_image_copy(picture->data, picture->linesize, planes,
+ stride, avctx->pix_fmt, img->d_w, img->d_h);
+ }
*got_frame = 1;
}
return avpkt->size;
--
2.33.0
_______________________________________________
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".
