openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2025-02-18 20:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!163 MOV fixed the new PSSH side data without adding old PSSH side data.

Browse Source 
Merge pull request !163 from zhenghongda/master
This commit is contained in:
openharmony_ci 2024-03-25 04:05:27 +00:00 committed by Gitee
commit c9f91fce6f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@ -6506,10 +6506,13 @@ static int mov_read_pssh_ex(MOVContext *c, AVIOContext *pb, MOVAtom atom)
pssh_exist_flag = is_exist_pssh(old_side_data, old_side_data_count, side_data_node);
}
if (pssh_exist_flag == 0) {
new_side_data = (AV_DrmInfo *)av_stream_new_side_data(st, AV_PKT_DATA_ENCRYPTION_INIT_INFO,
(buffer_size_t)(sizeof(AV_DrmInfo) * (old_side_data_count + 1)));
new_side_data = (AV_DrmInfo *)av_mallocz(sizeof(AV_DrmInfo) * (old_side_data_count + 1));
if (new_side_data != NULL) {
mov_drm_info_copy(new_side_data, old_side_data, old_side_data_count, side_data_node);
ret = av_stream_add_side_data(st, AV_PKT_DATA_ENCRYPTION_INIT_INFO, (uint8_t *)new_side_data,
(buffer_size_t)(sizeof(AV_DrmInfo) * (old_side_data_count + 1)));
if (ret < 0)
av_free(new_side_data);
}
}
return 0;