videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe' 

* commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe':
  movenc: Check that tracks->enc exists before trying to free extradata

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-27 12:33:39 +02:00
parent 0bd15938ec 3559fb97c4
commit ef4fcb30c4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/movenc.c
View File

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