mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'
* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e':
mov: Free intermediate arrays in the normal cleanup function
Conflicts:
libavformat/mov.c
See: a6b3e6d0b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
04cc753d07
|
@ -3281,13 +3281,15 @@ static int mov_read_close(AVFormatContext *s)
|
||||||
av_freep(&sc->drefs);
|
av_freep(&sc->drefs);
|
||||||
if (!sc->pb_is_copied)
|
if (!sc->pb_is_copied)
|
||||||
avio_close(sc->pb);
|
avio_close(sc->pb);
|
||||||
|
|
||||||
sc->pb = NULL;
|
sc->pb = NULL;
|
||||||
av_freep(&sc->chunk_offsets);
|
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->stsc_data);
|
||||||
|
av_freep(&sc->sample_sizes);
|
||||||
|
av_freep(&sc->keyframes);
|
||||||
av_freep(&sc->stts_data);
|
av_freep(&sc->stts_data);
|
||||||
|
av_freep(&sc->stps_data);
|
||||||
|
av_freep(&sc->rap_group);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mov->dv_demux) {
|
if (mov->dv_demux) {
|
||||||
|
|
Loading…
Reference in New Issue