virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avutil/mastering_display_metadata: set a sane default value for AVRational fields

Browse Source 
Prevent potential divisions by 0 when using them immediately after allocation.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-06-18 16:12:23 -03:00
parent 7f1b590480
commit 1044c09eca
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/mastering_display_metadata.c
View File

@ -25,9 +25,20 @@
#include "mastering_display_metadata.h" #include "mastering_display_metadata.h"
#include "mem.h" #include "mem.h"
static void get_defaults(AVMasteringDisplayMetadata *mastering)
{
for (int i = 0; i < 3; i++)
for (int j = 0; j < 2; j++)
mastering->display_primaries[i][j] = (AVRational) { 0, 1 };
mastering->white_point[0] =
mastering->white_point[1] =
mastering->min_luminance =
mastering->max_luminance = (AVRational) { 0, 1 };
}
AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void) AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void)
{ {
return av_mallocz(sizeof(AVMasteringDisplayMetadata)); return av_mastering_display_metadata_alloc_size(NULL);
} }
AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size) AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size)
@ -36,6 +47,8 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *siz
if (!mastering) if (!mastering)
return NULL; return NULL;
get_defaults(mastering);
if (size) if (size)
*size = sizeof(*mastering); *size = sizeof(*mastering);
@ -51,6 +64,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra
return NULL; return NULL;
memset(side_data->data, 0, sizeof(AVMasteringDisplayMetadata)); memset(side_data->data, 0, sizeof(AVMasteringDisplayMetadata));
get_defaults((AVMasteringDisplayMetadata *)side_data->data);
return (AVMasteringDisplayMetadata *)side_data->data; return (AVMasteringDisplayMetadata *)side_data->data;
} }

2
libavutil/version.h
View File

@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 59 #define LIBAVUTIL_VERSION_MAJOR 59
#define LIBAVUTIL_VERSION_MINOR 24 #define LIBAVUTIL_VERSION_MINOR 24
#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_MICRO 102
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \