Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:33:39 +0000 (12:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:33:39 +0000 (12:33 +0200)
* commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe':
  movenc: Check that tracks->enc exists before trying to free extradata

Conflicts:
libavformat/movenc.c

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

@@@ -4044,7 -3470,8 +4044,8 @@@ static int mov_write_trailer(AVFormatCo
      }
  
      if (mov->chapter_track) {
-         av_freep(&mov->tracks[mov->chapter_track].enc->extradata);
+         if (mov->tracks[mov->chapter_track].enc)
 -            av_free(mov->tracks[mov->chapter_track].enc->extradata);
++            av_freep(&mov->tracks[mov->chapter_track].enc->extradata);
          av_freep(&mov->tracks[mov->chapter_track].enc);
      }