[FFmpeg-cvslog] Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 26 00:33:24 2013 +0200| [f1efaf837117718e3b4c96336fe9b5f686b1fe30] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1efaf837117718e3b4c96336fe9b5f686b1fe30
---