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