Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 19:31:08 +0000 (21:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 19:33:04 +0000 (21:33 +0200)
commit0b2f860db53e6274836036d3e3ff57f8d043aa0f
tree266a2b356c3e52dd3c0659709749be0f0e1e85d3
parentf4445c7be45cdd84e9db887a5cfae55e9ff5868d
parentf401792595dd7760f531e8a3bd2336e9033bd45a
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@gmx.at>
libavfilter/vf_drawtext.c