github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-30 13:50:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/hls_sample_encryption: add missing padding for audio setup buffer

Browse Source 
Fixes ticket #22890.

The ff_hls_senc_parse_audio_setup_info function passes setup_data to
parsers like avpriv_ac3_parse_header and init_get_bits8 which require
the buffer to be padded with AV_INPUT_BUFFER_PADDING_SIZE bytes at the end.

(cherry picked from commit 71d5fa8d4d)
Signed-off-by: Marvin Scholz <epirat07@gmail.com>
This commit is contained in:
AdityaTeltia
2026-04-23 12:27:53 +05:30
committed by Marvin Scholz
parent 09f9ccee77
commit be9bd5a7cf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/hls_sample_encryption.c
View File

@@ -87,6 +87,7 @@ void ff_hls_senc_read_audio_setup_info(HLSAudioSetupInfo *info, const uint8_t *b
return;
memcpy(info->setup_data, buf, info->setup_data_length);
memset(info->setup_data + info->setup_data_length, 0, AV_INPUT_BUFFER_PADDING_SIZE);
}
int ff_hls_senc_parse_audio_setup_info(AVStream *st, HLSAudioSetupInfo *info)

2
libavformat/hls_sample_encryption.h
View File

@@ -52,7 +52,7 @@ typedef struct HLSAudioSetupInfo {
uint16_t priming;
uint8_t version;
uint8_t setup_data_length;
uint8_t setup_data[HLS_MAX_AUDIO_SETUP_DATA_LEN];
uint8_t setup_data[HLS_MAX_AUDIO_SETUP_DATA_LEN + AV_INPUT_BUFFER_PADDING_SIZE];
} HLSAudioSetupInfo;