diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 28e49e3fb67f25d513e844ff6277280e87474d82..104f176716816f91b7a45343e799fc1812f81ad6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -893,6 +893,8 @@ static int mov_write_trailer(AVFormatContext *s)
             av_free(mov->tracks[i].cluster[j]);
         }
         av_free(mov->tracks[i].cluster);
+        if( mov->tracks[i].vosLen ) av_free( mov->tracks[i].vosData );
+
         mov->tracks[i].cluster = NULL;
         mov->tracks[i].ents_allocated = mov->tracks[i].entry = 0;
     }
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 2da011a57efd0b9ef082705a9b6c8b2c37f32231..2ad5aa5c7692ab120f51d628fee92cacbda69bad 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -214,6 +214,9 @@ void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
     pid = filter->pid;
     if (filter->type == MPEGTS_SECTION)
         av_freep(&filter->u.section_filter.section_buf);
+    else if (filter->type == MPEGTS_PES)
+        av_freep(&filter->u.pes_filter.opaque);
+
     av_free(filter);
     ts->pids[pid] = NULL;
 }
@@ -1271,7 +1274,7 @@ static int mpegts_read_close(AVFormatContext *s)
     MpegTSContext *ts = s->priv_data;
     int i;
     for(i=0;i<NB_PID_MAX;i++)
-        av_free(ts->pids[i]);
+        if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
     return 0;
 }