diff mbox

[FFmpeg-devel,3/4] avformat/flacenc: add a deinit function

Message ID 20191021024934.1624-3-jamrial@gmail.com
State Accepted
Commit aeb8b65cdf3ede71d0c0781585b2f25aaa864a47
Headers show

Commit Message

James Almer Oct. 21, 2019, 2:49 a.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/flacenc.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Andreas Rheinhardt Oct. 21, 2019, 8:22 a.m. UTC | #1 
James Almer:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/flacenc.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
> index a07260f426..93cc79bbe0 100644
> --- a/libavformat/flacenc.c
> +++ b/libavformat/flacenc.c
> @@ -348,11 +348,17 @@ static int flac_write_trailer(struct AVFormatContext *s)
>          av_log(s, AV_LOG_WARNING, "unable to rewrite FLAC header.\n");
>      }
>  
> -    av_freep(&c->streaminfo);
> -
>      return 0;
>  }
>  
> +static void flac_deinit(struct AVFormatContext *s)
> +{
> +    FlacMuxerContext *c = s->priv_data;
> +
> +    ff_packet_list_free(&c->queue, &c->queue_end);
> +    av_freep(&c->streaminfo);
> +}
> +
>  static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
>  {
>      FlacMuxerContext *c = s->priv_data;
> @@ -425,6 +431,7 @@ AVOutputFormat ff_flac_muxer = {
>      .write_header      = flac_write_header,
>      .write_packet      = flac_write_packet,
>      .write_trailer     = flac_write_trailer,
> +    .deinit            = flac_deinit,
>      .flags             = AVFMT_NOTIMESTAMPS,
>      .priv_class        = &flac_muxer_class,
>  };
> 
LGTM.

- Andreas
diff mbox

Patch

diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index a07260f426..93cc79bbe0 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -348,11 +348,17 @@  static int flac_write_trailer(struct AVFormatContext *s)
         av_log(s, AV_LOG_WARNING, "unable to rewrite FLAC header.\n");
     }
 
-    av_freep(&c->streaminfo);
-
     return 0;
 }
 
+static void flac_deinit(struct AVFormatContext *s)
+{
+    FlacMuxerContext *c = s->priv_data;
+
+    ff_packet_list_free(&c->queue, &c->queue_end);
+    av_freep(&c->streaminfo);
+}
+
 static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
     FlacMuxerContext *c = s->priv_data;
@@ -425,6 +431,7 @@  AVOutputFormat ff_flac_muxer = {
     .write_header      = flac_write_header,
     .write_packet      = flac_write_packet,
     .write_trailer     = flac_write_trailer,
+    .deinit            = flac_deinit,
     .flags             = AVFMT_NOTIMESTAMPS,
     .priv_class        = &flac_muxer_class,
 };