diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:39:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:40:14 +0100 |
| commit | 6fd7456f85720e8a6fdfacd365d14738d2e272b8 (patch) | |
| tree | 51463369fdc458a8ea298f2d8f8d5b656b480eda /doc/t2h.pm | |
| parent | ee025a0c6137a07f2a2cd4cb5bd09b90076d1772 (diff) | |
| parent | 608e8d8dd754199b657b439f9e722e0b45f84461 (diff) | |
| download | ffmpeg-6fd7456f85720e8a6fdfacd365d14738d2e272b8.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'doc/t2h.pm')
0 files changed, 0 insertions, 0 deletions