[FFmpeg-devel] [PATCH 5/5] lavc/hevcdec: improve check for PPS changing between slices

[Frank Plowman]

On 26/06/2024 13:43, Anton Khirnov wrote:
> Compare actual PPS objects rather than just PPS ID, as the former might
> change while the latter stays the same.
> 
> Reported-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/hevc/hevcdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
> index 01d32086f2..fd143cddab 100644
> --- a/libavcodec/hevc/hevcdec.c
> +++ b/libavcodec/hevc/hevcdec.c
> @@ -603,7 +603,7 @@ static int hls_slice_header(SliceHeader *sh, const HEVCContext *s, GetBitContext
>          av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id);
>          return AVERROR_INVALIDDATA;
>      }
> -    if (!sh->first_slice_in_pic_flag && pps_id != sh->pps_id) {
> +    if (!sh->first_slice_in_pic_flag && s->ps.pps_list[pps_id] != s->pps) {
>          av_log(s->avctx, AV_LOG_ERROR, "PPS changed between slices.\n");
>          return AVERROR_INVALIDDATA;
>      }

LGTM.

-- 
Frank