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

avformat/apv: use memset to zero initialize frame_info

Browse Source 
Don't rely on implicit zeroing.
Should fix fate failures on msvc targets.

Found-by: Kacper Michajlow <kasper93@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-07-19 20:00:28 -03:00
parent 722a2170e8
commit 85ac589211
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/apv.c
View File

@ -252,7 +252,7 @@ static int apv_add_frameinfo(APVDecoderConfigurationEntry *configuration_entry,
int ff_isom_parse_apvc(APVDecoderConfigurationRecord *apvc, int ff_isom_parse_apvc(APVDecoderConfigurationRecord *apvc,
const AVPacket *pkt, void *logctx) const AVPacket *pkt, void *logctx)
{ {
APVDecoderFrameInfo frame_info = { .capture_time_distance_ignored = 1 }; APVDecoderFrameInfo frame_info;
int ret; int ret;
if (pkt->size < 8 || AV_RB32(pkt->data) != APV_SIGNATURE) if (pkt->size < 8 || AV_RB32(pkt->data) != APV_SIGNATURE)
@ -265,6 +265,9 @@ int ff_isom_parse_apvc(APVDecoderConfigurationRecord *apvc,
return ret; return ret;
} }
memset(&frame_info, 0, sizeof(frame_info));
frame_info.capture_time_distance_ignored = 1;
for (int i = 0; i < apvc->frag.nb_units; i++) { for (int i = 0; i < apvc->frag.nb_units; i++) {
const CodedBitstreamUnit *pbu = &apvc->frag.units[i]; const CodedBitstreamUnit *pbu = &apvc->frag.units[i];
int j; int j;
@ -304,6 +307,11 @@ int ff_isom_parse_apvc(APVDecoderConfigurationRecord *apvc,
frame_info.transfer_characteristics = header->transfer_characteristics; frame_info.transfer_characteristics = header->transfer_characteristics;
frame_info.matrix_coefficients = header->matrix_coefficients; frame_info.matrix_coefficients = header->matrix_coefficients;
frame_info.full_range_flag = header->full_range_flag; frame_info.full_range_flag = header->full_range_flag;
} else {
frame_info.color_primaries =
frame_info.transfer_characteristics =
frame_info.matrix_coefficients =
frame_info.full_range_flag = 0;
} }
for (j = 0; j < apvc->number_of_configuration_entry; j++) { for (j = 0; j < apvc->number_of_configuration_entry; j++) {