mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
avcodec/hevc/ps: add a range check for sps_max_sub_layers
It can't be higher than vps_max_sub_layers. Do this while keeping the workaround for qsvenc_hevc calling ff_hevc_parse_sps() without a vps_list, as in some cases it needs to parse an sps to generate a fake vps derived from it. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
3290692d18
commit
bd6283342c
@ -1158,6 +1158,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
|
||||
HEVCWindow *ow;
|
||||
int ret = 0;
|
||||
int bit_depth_chroma, num_comps, multi_layer_ext;
|
||||
int vps_max_sub_layers;
|
||||
int i;
|
||||
|
||||
// Coded parameters
|
||||
@ -1182,7 +1183,10 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
|
||||
|
||||
sps->max_sub_layers = sps->vps->vps_max_sub_layers;
|
||||
}
|
||||
if (sps->max_sub_layers > HEVC_MAX_SUB_LAYERS) {
|
||||
vps_max_sub_layers = sps->vps ? sps->vps->vps_max_sub_layers
|
||||
: FFMIN(sps->max_sub_layers, HEVC_MAX_SUB_LAYERS);
|
||||
|
||||
if (sps->max_sub_layers > vps_max_sub_layers) {
|
||||
av_log(avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n",
|
||||
sps->max_sub_layers);
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
Loading…
Reference in New Issue
Block a user