Merge commit '456ffec35d55288d589aa1901919e038c3427f30'

[ffmpeg] / libavformat / mpegenc.c

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index f0fe7714c69dbeac72f498d2e25323f0cd89ba1d..3ef2b24692e00cf42a7ff37168ae0d7e6c26350a 100644 (file)
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -40,7 +40,6 @@ typedef struct PacketDesc {
     int64_t dts;
     int size;
     int unwritten_size;
-    int flags;
     struct PacketDesc *next;
 } PacketDesc;
 
@@ -517,7 +516,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
 
 fail:
     for (i = 0; i < ctx->nb_streams; i++)
-        av_free(ctx->streams[i]->priv_data);
+        av_freep(&ctx->streams[i]->priv_data);
     return AVERROR(ENOMEM);
 }