diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-26 00:33:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-26 00:33:41 +0200 |
| commit | f1efaf837117718e3b4c96336fe9b5f686b1fe30 (patch) | |
| tree | c7376dbfdc47ee860d0044cf9573f938158c65f8 /arch.mak | |
| parent | ad194b04879cb5c1b489d2453517228cf15eb4e8 (diff) | |
| parent | 84f571e37f074724393b152843cd94e4f9a10100 (diff) | |
| download | ffmpeg-f1efaf837117718e3b4c96336fe9b5f686b1fe30.tar.gz | |
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>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions