[FFmpeg-cvslog] Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
Michael Niedermayer
git at videolan.org
Thu Aug 7 23:06:29 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 7 22:11:37 2014 +0200| [efcf1fcad32568d5784640c687b067dd205b1cba] | committer: Michael Niedermayer
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efcf1fcad32568d5784640c687b067dd205b1cba
---
More information about the ffmpeg-cvslog
mailing list