[FFmpeg-cvslog] Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
Michael Niedermayer
git at videolan.org
Sat Oct 18 21:43:00 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 21:31:08 2014 +0200| [0b2f860db53e6274836036d3e3ff57f8d043aa0f] | committer: Michael Niedermayer
Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a':
vf_drawtext: Do not leak the mmapped textfile
Conflicts:
libavfilter/vf_drawtext.c
See: 6956b048d8198dce5126c8942dece21cfb1a7978
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b2f860db53e6274836036d3e3ff57f8d043aa0f
---
More information about the ffmpeg-cvslog
mailing list