James Almer:
> Signed-off-by: James Almer <jamr...@gmail.com>
> ---
> libavcodec/hevc_ps.c | 14 +++++++++++++-
> libavcodec/hevc_ps.h | 2 +-
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
> index fb997066d9..d29cf9f372 100644
> --- a/libavcodec/hevc_ps.c
> +++ b/libavcodec/hevc_ps.c
> @@ -438,13 +438,20 @@ static int decode_hrd(GetBitContext *gb, int
> common_inf_present,
> return 0;
> }
>
> +static void uninit_vps(FFRefStructOpaque opaque, void *obj)
> +{
> + HEVCVPS *vps = obj;
> +
> + av_freep(&vps->hdr);
> +}
> +
> int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
> HEVCParamSets *ps)
> {
> int i,j;
> int vps_id = 0;
> ptrdiff_t nal_size;
> - HEVCVPS *vps = ff_refstruct_allocz(sizeof(*vps));
> + HEVCVPS *vps = ff_refstruct_alloc_ext(sizeof(*vps), 0, NULL, uninit_vps);
>
> if (!vps)
> return AVERROR(ENOMEM);
> @@ -533,6 +540,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb,
> AVCodecContext *avctx,
> "vps_num_hrd_parameters %d is invalid\n",
> vps->vps_num_hrd_parameters);
> goto err;
> }
> +
> + vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr));
> + if (!vps->hdr)
> + goto err;
> +
> for (i = 0; i < vps->vps_num_hrd_parameters; i++) {
> int common_inf_present = 1;
>
> diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h
> index 786c896709..87cea479e9 100644
> --- a/libavcodec/hevc_ps.h
> +++ b/libavcodec/hevc_ps.h
> @@ -152,7 +152,7 @@ typedef struct PTL {
>
> typedef struct HEVCVPS {
> unsigned int vps_id;
> - HEVCHdrParams hdr[HEVC_MAX_LAYER_SETS];
> + HEVCHdrParams *hdr;
>
> uint8_t vps_temporal_id_nesting_flag;
> int vps_max_layers;
That's what I had in mind.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
