Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 22:33:24 +0000 (00:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 22:33:41 +0000 (00:33 +0200)
commitf1efaf837117718e3b4c96336fe9b5f686b1fe30
treec7376dbfdc47ee860d0044cf9573f938158c65f8
parentad194b04879cb5c1b489d2453517228cf15eb4e8
parent84f571e37f074724393b152843cd94e4f9a10100
Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg

* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg:
  enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples

Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi