Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 12:51:58 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 13:06:27 +0000 (14:06 +0100)
* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e':
  mov: Free intermediate arrays in the normal cleanup function

Conflicts:
libavformat/mov.c

See: a6b3e6d0b49b47c9b874e59b88a8051af338f520
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mov.c

@@@ -3279,15 -2827,16 +3279,17 @@@ static int mov_read_close(AVFormatConte
              av_freep(&sc->drefs[j].dir);
          }
          av_freep(&sc->drefs);
 -        if (sc->pb && sc->pb != s->pb)
 +        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) {