[FFmpeg-cvslog] Merge commit '0e4c166cdd6446522a085dd9731967d09ac71f72'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Feb 21 22:03:15 2018 +0000| [af3727e2399df83b57892c22011e4dd748516897] | committer: Mark Thompson

Merge commit '0e4c166cdd6446522a085dd9731967d09ac71f72'

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

Merged-by: Mark Thompson <sw at jkqxz.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af3727e2399df83b57892c22011e4dd748516897
---

 libavcodec/cbs_h2645.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 2f96e4f20e..9864d67acb 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -674,6 +674,8 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \
                " id : %d.\n", id); \
         return AVERROR_INVALIDDATA; \
     } \
+    if (priv->ps_var[id] == priv->active_ ## ps_var) \
+        priv->active_ ## ps_var = NULL ; \
     av_freep(&priv->ps_var[id]); \
     priv->ps_var[id] = av_malloc(sizeof(*ps_var)); \
     if (!priv->ps_var[id]) \


======================================================================