diff mbox

[FFmpeg-devel] fftools/ffmpeg: Free swresample dictionary during cleanup

Message ID 20191024133635.8992-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 6f2a3958cfac135c60b509a61a4fd39432d8f9a9
Headers show

Commit Message

Andreas Rheinhardt Oct. 24, 2019, 1:36 p.m. UTC
Freeing this was forgotten in ad899522.

Fixes #8315 and #8316.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 fftools/ffmpeg.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Paul B Mahol Oct. 24, 2019, 1:46 p.m. UTC | #1
LGTM

On 10/24/19, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote:
> Freeing this was forgotten in ad899522.
>
> Fixes #8315 and #8316.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  fftools/ffmpeg.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> index 8e408c808a..27f68933f8 100644
> --- a/fftools/ffmpeg.c
> +++ b/fftools/ffmpeg.c
> @@ -567,6 +567,7 @@ static void ffmpeg_cleanup(int ret)
>          ost->audio_channels_mapped = 0;
>
>          av_dict_free(&ost->sws_dict);
> +        av_dict_free(&ost->swr_opts);
>
>          avcodec_free_context(&ost->enc_ctx);
>          avcodec_parameters_free(&ost->ref_par);
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer Oct. 24, 2019, 10:18 p.m. UTC | #2
On Thu, Oct 24, 2019 at 03:46:53PM +0200, Paul B Mahol wrote:
> LGTM

will apply

thx

> 
> On 10/24/19, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote:
> > Freeing this was forgotten in ad899522.
> >
> > Fixes #8315 and #8316.
> >
> > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> > ---
> >  fftools/ffmpeg.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> > index 8e408c808a..27f68933f8 100644
> > --- a/fftools/ffmpeg.c
> > +++ b/fftools/ffmpeg.c
> > @@ -567,6 +567,7 @@ static void ffmpeg_cleanup(int ret)
> >          ost->audio_channels_mapped = 0;
> >
> >          av_dict_free(&ost->sws_dict);
> > +        av_dict_free(&ost->swr_opts);
> >
> >          avcodec_free_context(&ost->enc_ctx);
> >          avcodec_parameters_free(&ost->ref_par);
> > --
> > 2.20.1
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 8e408c808a..27f68933f8 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -567,6 +567,7 @@  static void ffmpeg_cleanup(int ret)
         ost->audio_channels_mapped = 0;
 
         av_dict_free(&ost->sws_dict);
+        av_dict_free(&ost->swr_opts);
 
         avcodec_free_context(&ost->enc_ctx);
         avcodec_parameters_free(&ost->ref_par);