mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
lavu/video_enc_params: make sure blocks are properly aligned
This commit is contained in:
parent
1256b71ba9
commit
c8778606b3
@ -29,10 +29,14 @@
|
|||||||
AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
|
AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
|
||||||
unsigned int nb_blocks, size_t *out_size)
|
unsigned int nb_blocks, size_t *out_size)
|
||||||
{
|
{
|
||||||
|
const size_t blocks_offset = offsetof(
|
||||||
|
struct {
|
||||||
|
AVVideoEncParams p;
|
||||||
|
AVVideoBlockParams b;
|
||||||
|
}, b);
|
||||||
|
size_t size = blocks_offset;
|
||||||
AVVideoEncParams *par;
|
AVVideoEncParams *par;
|
||||||
size_t size;
|
|
||||||
|
|
||||||
size = sizeof(*par);
|
|
||||||
if (nb_blocks > (SIZE_MAX - size) / sizeof(AVVideoBlockParams))
|
if (nb_blocks > (SIZE_MAX - size) / sizeof(AVVideoBlockParams))
|
||||||
return NULL;
|
return NULL;
|
||||||
size += sizeof(AVVideoBlockParams) * nb_blocks;
|
size += sizeof(AVVideoBlockParams) * nb_blocks;
|
||||||
@ -44,7 +48,7 @@ AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
|
|||||||
par->type = type;
|
par->type = type;
|
||||||
par->nb_blocks = nb_blocks;
|
par->nb_blocks = nb_blocks;
|
||||||
par->block_size = sizeof(AVVideoBlockParams);
|
par->block_size = sizeof(AVVideoBlockParams);
|
||||||
par->blocks_offset = sizeof(*par);
|
par->blocks_offset = blocks_offset;
|
||||||
|
|
||||||
if (out_size)
|
if (out_size)
|
||||||
*out_size = size;
|
*out_size = size;
|
||||||
|
Loading…
Reference in New Issue
Block a user