highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/ambient_viewing_environment: 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:06 -03:00
parent 5140d8334e
commit 7f1b590480
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/ambient_viewing_environment.c
View File

@ -21,6 +21,13 @@
#include "ambient_viewing_environment.h" #include "ambient_viewing_environment.h"
#include "mem.h" #include "mem.h"
static void get_defaults(AVAmbientViewingEnvironment *env)
{
env->ambient_illuminance =
env->ambient_light_x =
env->ambient_light_y = (AVRational) { 0, 1 };
}
AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size) AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size)
{ {
AVAmbientViewingEnvironment *env = AVAmbientViewingEnvironment *env =
@ -28,6 +35,8 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size)
if (!env) if (!env)
return NULL; return NULL;
get_defaults(env);
if (size) if (size)
*size = sizeof(*env); *size = sizeof(*env);
@ -44,6 +53,7 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_create_side_data(AVF
return NULL; return NULL;
memset(side_data->data, 0, side_data->size); memset(side_data->data, 0, side_data->size);
get_defaults((AVAmbientViewingEnvironment *)side_data->data);
return (AVAmbientViewingEnvironment *)side_data->data; return (AVAmbientViewingEnvironment *)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 100 #define LIBAVUTIL_VERSION_MICRO 101
#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, \