ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan
18 00:39:59 2015 +0100| [6fd7456f85720e8a6fdfacd365d14738d2e272b8] | committer:
Michael Niedermayer
Merge commit '608e8d8dd754199b657b439f9e722e0b45f84461' into release/2.4
* commit '608e8d8dd754199b657b439f9e722e0b45f84461':
vf_drawtext: Do not leak the mmapped textfile
Conflicts:
libavfilter/vf_drawtext.c
See: 6956b048d8198dce5126c8942dece21cfb1a7978
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fd7456f85720e8a6fdfacd365d14738d2e272b8
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
