[FFmpeg-cvslog] Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'
Michael Niedermayer
git at videolan.org
Tue Aug 27 12:41:29 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 27 12:33:39 2013 +0200| [ef4fcb30c4ec55aad8f3872534be06491f8db917] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef4fcb30c4ec55aad8f3872534be06491f8db917
---
More information about the ffmpeg-cvslog
mailing list