diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2023-06-13 15:37:15 +0800 |
|---|---|---|
| committer | Zhao Zhili <zhilizhao@tencent.com> | 2023-07-04 04:49:48 +0800 |
| commit | 372f71cdc76c1e265d5be02de1f7e9f131912e9f (patch) | |
| tree | 3eca07914c822bf4f07038249e94fbac205120fb | |
| parent | 50f34172e0cca2cabc5836308ec66dbf93f5f2a3 (diff) | |
| download | ffmpeg-372f71cdc76c1e265d5be02de1f7e9f131912e9f.tar.gz | |
avcodec/hevc_parse: restrict configurationVersion to 0 and 1
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>
| -rw-r--r-- | libavcodec/hevc_parse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 29dfd479f3..1f3beed183 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -86,11 +86,11 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, bytestream2_init(&gb, data, size); - if (size > 3 && (data[0] || data[1] || data[2] > 1)) { - /* It seems the extradata is encoded as hvcC format. - * Temporarily, we support configurationVersion==0 until 14496-15 3rd - * is finalized. When finalized, configurationVersion will be 1 and we - * can recognize hvcC by checking if avctx->extradata[0]==1 or not. */ + /* data[0] == 1 is configurationVersion from 14496-15. + * data[0] == 0 is for backward compatibility predates the standard. + */ + if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { + /* It seems the extradata is encoded as hvcC format. */ int i, j, num_arrays, nal_len_size; *is_nalff = 1; |