virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/hevc_parse: restrict configurationVersion to 0 and 1

Browse Source 
The standard only defined configurationVersion 1.
configurationVersion 0 is for backward compatibility predates the
standard.

This patch reduces the chance that some malformated streams being
detected as hvcC.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2023-06-13 15:37:15 +08:00
parent 50f34172e0
commit 372f71cdc7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/hevc_parse.c
View File

@@ -86,11 +86,11 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
bytestream2_init(&gb, data, size); bytestream2_init(&gb, data, size);
if (size > 3 && (data[0] || data[1] || data[2] > 1)) { /* data[0] == 1 is configurationVersion from 14496-15.
/* It seems the extradata is encoded as hvcC format. * data[0] == 0 is for backward compatibility predates the standard.
* Temporarily, we support configurationVersion==0 until 14496-15 3rd */
* is finalized. When finalized, configurationVersion will be 1 and we if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) {
* can recognize hvcC by checking if avctx->extradata[0]==1 or not. */ /* It seems the extradata is encoded as hvcC format. */
int i, j, num_arrays, nal_len_size; int i, j, num_arrays, nal_len_size;
*is_nalff = 1; *is_nalff = 1;