On Thu, Apr 15, 2021 at 03:52:31PM +0200, Andreas Rheinhardt wrote: > NellyMoserEncodeContext.avctx is only set in init after these checks, > yet it is used by encode_end(). > This is a regression since 0a56bfa71f751a2b25da8d060a019c1c75ca9d7b. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > --- > Sorry for this. Will apply soon and backport. > > libavcodec/nellymoserenc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c > index 99ede2f42b..8670431dcc 100644 > --- a/libavcodec/nellymoserenc.c > +++ b/libavcodec/nellymoserenc.c > @@ -138,10 +138,8 @@ static av_cold int encode_end(AVCodecContext *avctx) > > ff_mdct_end(&s->mdct_ctx); > > - if (s->avctx->trellis) { > - av_freep(&s->opt); > - av_freep(&s->path); > - } > + av_freep(&s->opt); > + av_freep(&s->path);
didnt test but LGTM thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "I am not trying to be anyone's saviour, I'm trying to think about the future and not be sad" - Elon Musk
signature.asc
Description: PGP signature
_______________________________________________ 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".