ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efcf1fcad32568d5784640c687b067dd205b1cba
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
