Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:12:15 +0000 (17:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:13:09 +0000 (17:13 +0100)
* commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd':
  segafilm: fix leaks if reading the header fails

Conflicts:
libavformat/segafilm.c

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

@@@ -75,6 -75,16 +75,15 @@@ static int film_probe(AVProbeData *p
      return AVPROBE_SCORE_MAX;
  }
  
 -    av_freep(&film->stereo_buffer);
+ static int film_read_close(AVFormatContext *s)
+ {
+     FilmDemuxContext *film = s->priv_data;
+     av_freep(&film->sample_table);
+     return 0;
+ }
  static int film_read_header(AVFormatContext *s)
  {
      FilmDemuxContext *film = s->priv_data;