1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit '0e4c166cdd6446522a085dd9731967d09ac71f72'

* commit '0e4c166cdd6446522a085dd9731967d09ac71f72':
  cbs_h2645: Remove active ps references when it is replaced

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson
2018-02-21 22:03:15 +00:00

View File

@@ -674,6 +674,8 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \
" id : %d.\n", id); \ " id : %d.\n", id); \
return AVERROR_INVALIDDATA; \ return AVERROR_INVALIDDATA; \
} \ } \
if (priv->ps_var[id] == priv->active_ ## ps_var) \
priv->active_ ## ps_var = NULL ; \
av_freep(&priv->ps_var[id]); \ av_freep(&priv->ps_var[id]); \
priv->ps_var[id] = av_malloc(sizeof(*ps_var)); \ priv->ps_var[id] = av_malloc(sizeof(*ps_var)); \
if (!priv->ps_var[id]) \ if (!priv->ps_var[id]) \