-
Michael Niedermayer authored
* commit '608e8d8d': vf_drawtext: Do not leak the mmapped textfile Conflicts: libavfilter/vf_drawtext.c See: 6956b048Merged-by:
Michael Niedermayer <michaelni@gmx.at>
6fd7456f
* commit '608e8d8d': vf_drawtext: Do not leak the mmapped textfile Conflicts: libavfilter/vf_drawtext.c See: 6956b048Merged-by:Michael Niedermayer <michaelni@gmx.at>