diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 13:51:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 14:06:27 +0100 |
| commit | 04cc753d0744ae25c2789b01597f041062378abd (patch) | |
| tree | f9c10e0e658c02d45eba76afa289b3d77897db64 /libavformat/mov.c | |
| parent | 8b4190da9382434758e390370b1752583bf4ce3a (diff) | |
| parent | d51f09962d5b4bc999fb70c040f330dd1873212e (diff) | |
| download | ffmpeg-04cc753d0744ae25c2789b01597f041062378abd.tar.gz | |
Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'
* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e':
mov: Free intermediate arrays in the normal cleanup function
Conflicts:
libavformat/mov.c
See: a6b3e6d0b49b47c9b874e59b88a8051af338f520
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index a4804e4d69..4b684cec3f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3281,13 +3281,15 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->drefs); if (!sc->pb_is_copied) avio_close(sc->pb); + sc->pb = NULL; av_freep(&sc->chunk_offsets); - av_freep(&sc->keyframes); - av_freep(&sc->sample_sizes); - av_freep(&sc->stps_data); av_freep(&sc->stsc_data); + av_freep(&sc->sample_sizes); + av_freep(&sc->keyframes); av_freep(&sc->stts_data); + av_freep(&sc->stps_data); + av_freep(&sc->rap_group); } if (mov->dv_demux) { |