diff options
| author | James Almer <jamrial@gmail.com> | 2024-06-18 16:12:06 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-06-20 17:02:50 -0300 |
| commit | 7f1b590480e7519e25ac9fcd99b0f9916fb03462 (patch) | |
| tree | fd2212b560336b94c9cc49ff9f17a2645b956497 | |
| parent | 5140d8334e3bc95a9070e6d2e6d71f4a5f016d53 (diff) | |
| download | ffmpeg-7f1b590480e7519e25ac9fcd99b0f9916fb03462.tar.gz | |
avutil/ambient_viewing_environment: set a sane default value for AVRational fields
Prevent potential divisions by 0 when using them immediately after allocation.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/ambient_viewing_environment.c | 10 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libavutil/ambient_viewing_environment.c b/libavutil/ambient_viewing_environment.c index c47458cfa8..e359727776 100644 --- a/libavutil/ambient_viewing_environment.c +++ b/libavutil/ambient_viewing_environment.c @@ -21,6 +21,13 @@ #include "ambient_viewing_environment.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 *env = @@ -28,6 +35,8 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size) if (!env) return NULL; + get_defaults(env); + if (size) *size = sizeof(*env); @@ -44,6 +53,7 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_create_side_data(AVF return NULL; memset(side_data->data, 0, side_data->size); + get_defaults((AVAmbientViewingEnvironment *)side_data->data); return (AVAmbientViewingEnvironment *)side_data->data; } diff --git a/libavutil/version.h b/libavutil/version.h index 8044fd3935..4f51d441fa 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 59 #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, \ LIBAVUTIL_VERSION_MINOR, \ |