diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:33:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:33:31 +0200 |
| commit | 04dd5ddedad384669d531e4b334888e8d8888d54 (patch) | |
| tree | 450c4ce9b1293a6f894e16185c39463de2ec92fe /tests | |
| parent | a134f9676e4f7988d360b69e0aed176055c47bcb (diff) | |
| parent | c0279956b3ca3e5fd0a6a25253893d6f07000e68 (diff) | |
Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'
* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68':
vf_fade: use the name 's' for the pointer to the private context
vf_drawtext: use the name 's' for the pointer to the private context
vf_drawbox: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions