ffmpeg/libavfilter
Michael Niedermayer 0b2f860db5 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>
2014-10-18 21:33:04 +02:00
..
2014-02-26 16:37:59 +00:00
2014-07-03 08:07:42 +00:00
2014-05-03 20:08:18 +02:00
2014-01-19 17:12:50 +01:00
2014-06-29 13:26:04 +02:00
2014-06-03 10:58:19 -08:00
2013-01-05 05:21:44 +01:00
2013-09-30 08:47:40 +00:00
2014-08-13 01:00:38 +02:00
2013-09-12 14:01:43 +00:00
2014-10-14 17:15:56 +02:00
2014-06-22 20:49:00 +02:00
2014-08-24 14:35:11 +02:00
2014-06-24 03:16:53 +02:00
2014-10-14 17:15:56 +02:00
2014-02-07 09:33:56 +01:00
2014-06-18 00:07:12 +02:00
2014-06-03 10:58:19 -08:00
2014-01-19 17:13:02 +01:00